Commit 9225ec35 authored by Thomas's avatar Thomas
Browse files

Use ContextCompat

parent 4a07e7c5

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

+2 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.view.View;



import androidx.core.content.ContextCompat;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import java.io.IOException;
@@ -148,11 +149,7 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C 
                }

            }

        };

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            registerReceiver(manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS), Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS));

        }

        ContextCompat.registerReceiver(PeertubeBaseMainActivity.this, manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS), ContextCompat.RECEIVER_NOT_EXPORTED);

    }



    @Override

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

+3 −7
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import androidx.appcompat.widget.PopupMenu; 
import androidx.appcompat.widget.SearchView;

import androidx.core.app.ActivityCompat;

import androidx.core.app.ActivityOptionsCompat;

import androidx.core.content.ContextCompat;

import androidx.core.view.GravityCompat;

import androidx.cursoradapter.widget.CursorAdapter;

import androidx.fragment.app.Fragment;
@@ -1529,13 +1530,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 


        binding.toolbarSearch.setOnSearchClickListener(v -> binding.tabLayout.setVisibility(View.VISIBLE));

        //For receiving  data from other activities

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA), Context.RECEIVER_NOT_EXPORTED);

            registerReceiver(broadcast_error_message, new IntentFilter(Helper.INTENT_COMPOSE_ERROR_MESSAGE), Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA));

            registerReceiver(broadcast_error_message, new IntentFilter(Helper.INTENT_COMPOSE_ERROR_MESSAGE));

        }

        ContextCompat.registerReceiver(BaseMainActivity.this, broadcast_data, new IntentFilter(Helper.BROADCAST_DATA), ContextCompat.RECEIVER_NOT_EXPORTED);

        ContextCompat.registerReceiver(BaseMainActivity.this, broadcast_error_message, new IntentFilter(Helper.INTENT_COMPOSE_ERROR_MESSAGE), ContextCompat.RECEIVER_NOT_EXPORTED);

        if (emojis == null || !emojis.containsKey(BaseMainActivity.currentInstance) || emojis.get(BaseMainActivity.currentInstance) == null) {

            new Thread(() -> {

                try {

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

+1 −5
Original line number Diff line number Diff line
@@ -734,11 +734,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
            }

        }

        MastodonHelper.loadPPMastodon(binding.profilePicture, account.mastodon_account);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            registerReceiver(imageReceiver, new IntentFilter(Helper.INTENT_SEND_MODIFIED_IMAGE), android.content.Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(imageReceiver, new IntentFilter(Helper.INTENT_SEND_MODIFIED_IMAGE));

        }

        ContextCompat.registerReceiver(ComposeActivity.this, imageReceiver, new IntentFilter(Helper.INTENT_SEND_MODIFIED_IMAGE), ContextCompat.RECEIVER_NOT_EXPORTED);

        if (timer != null) {

            timer.scheduleAtFixedRate(new TimerTask() {

                @Override

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

+1 −5
Original line number Diff line number Diff line
@@ -140,11 +140,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload 
        binding.mediaViewpager.setAdapter(mPagerAdapter);

        binding.mediaViewpager.setSaveEnabled(false);

        binding.mediaViewpager.setCurrentItem(mediaPosition - 1);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            registerReceiver(onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), android.content.Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));

        }

        ContextCompat.registerReceiver(MediaActivity.this, onDownloadComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), ContextCompat.RECEIVER_NOT_EXPORTED);

        String description = attachments.get(mediaPosition - 1).description;

        handler = new Handler();

        if (attachments.get(mediaPosition - 1).status != null) {

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

+1 −5
Original line number Diff line number Diff line
@@ -206,11 +206,7 @@ public class ProfileActivity extends BaseActivity { 
        }

        //Check if account is homeMuted

        accountsVM.isMuted(currentAccount, account).observe(this, result -> homeMuted = result != null && result);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA), android.content.Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(broadcast_data, new IntentFilter(Helper.BROADCAST_DATA));

        }

        ContextCompat.registerReceiver(ProfileActivity.this, broadcast_data, new IntentFilter(Helper.BROADCAST_DATA), ContextCompat.RECEIVER_NOT_EXPORTED);





    }