Commit 25e42fc7 authored by Thomas's avatar Thomas
Browse files

Set app Id when sending BroadCasts

parent 9225ec35

app/build.gradle

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ dependencies { 
    implementation 'androidx.browser:browser:1.7.0'

    implementation 'androidx.documentfile:documentfile:1.0.1'

    implementation 'com.github.amoskorir:avatarimagegenerator:1.5.0'

    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

    implementation 'com.google.android.exoplayer:extension-mediasession:2.19.1'

    implementation "com.github.mabbas007:TagsEditText:1.0.5"

    implementation "net.gotev:uploadservice:4.9.2"

app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java

+6 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.view.View; 
import android.webkit.MimeTypeMap;



import androidx.appcompat.app.AlertDialog;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;





import com.google.android.exoplayer2.ExoPlayer;

import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -38,6 +38,7 @@ import org.jetbrains.annotations.NotNull; 
import java.io.IOException;

import java.security.GeneralSecurityException;



import app.fedilab.android.BuildConfig;

import app.fedilab.android.R;

import app.fedilab.android.databinding.ActivityPeertubeBinding;

import app.fedilab.android.mastodon.activities.BaseBarActivity;
@@ -124,7 +125,8 @@ public class BasePeertubeActivity extends BaseBarActivity { 
                            if (PeertubeBaseMainActivity.chromecastActivated) {

                                b.putInt("displayed", 0);

                                intentBC.putExtras(b);

                                LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC);

                                intentBC.setPackage(BuildConfig.APPLICATION_ID);

                                sendBroadcast(intentBC);

                                Handler mainHandler = new Handler(Looper.getMainLooper());

                                Runnable myRunnable = () -> {

                                    binding.doubleTapPlayerView.setVisibility(View.VISIBLE);
@@ -136,7 +138,8 @@ public class BasePeertubeActivity extends BaseBarActivity { 
                                b.putInt("displayed", 1);

                                b.putSerializable("castedTube", peertube);

                                intentBC.putExtras(b);

                                LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC);

                                intentBC.setPackage(BuildConfig.APPLICATION_ID);

                                sendBroadcast(intentBC);

                                try {

                                    Handler mainHandler = new Handler(Looper.getMainLooper());

                                    Runnable myRunnable = () -> {

app/src/fdroid/java/app/fedilab/android/activities/PeertubeBaseMainActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.os.Looper; 
import android.view.View;



import androidx.core.content.ContextCompat;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;





import java.io.IOException;

import java.net.InetAddress;
@@ -36,6 +36,7 @@ import java.util.Collections; 
import java.util.Enumeration;

import java.util.List;



import app.fedilab.android.BuildConfig;

import app.fedilab.android.R;

import app.fedilab.android.databinding.ActivityMainPeertubeBinding;

import app.fedilab.android.mastodon.activities.BaseActivity;
@@ -70,7 +71,8 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C 
            Bundle b = new Bundle();

            b.putInt("displayed", 0);

            intentBC.putExtras(b);

            LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).sendBroadcast(intentBC);

            intentBC.setPackage(BuildConfig.APPLICATION_ID);

            sendBroadcast(intentBC);

        });



        binding.castTogglePlay.setOnClickListener(v -> {

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ import androidx.fragment.app.Fragment; 
import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.lifecycle.ViewModelProvider;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import androidx.navigation.NavController;

import androidx.navigation.Navigation;

import androidx.navigation.ui.AppBarConfiguration;
@@ -694,8 +694,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                Bundle b = new Bundle();

                b.putBoolean(ARG_REFRESH_NOTFICATION, true);

                Intent intentBC = new Intent(Helper.RECEIVE_STATUS_ACTION);

                intentBC.setPackage(BuildConfig.APPLICATION_ID);

                intentBC.putExtras(b);

                LocalBroadcastManager.getInstance(activity).sendBroadcast(intentBC);

                activity.sendBroadcast(intentBC);

            }

        }, 1000);

        intent.removeExtra(Helper.INTENT_ACTION);

app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import androidx.appcompat.app.ActionBar; 
import androidx.appcompat.app.AlertDialog;

import androidx.core.content.ContextCompat;

import androidx.lifecycle.ViewModelProvider;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.work.Data;