Skip to content

Commit 665b481

Browse files
committed
Specify RECEIVER_EXPORTED/RECEIVER_NOT_EXPORTED for sdk34
1 parent 4ddc064 commit 665b481

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

app/src/main/java/org/schabi/newpipe/MainActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import androidx.appcompat.app.ActionBarDrawerToggle;
5151
import androidx.appcompat.app.AppCompatActivity;
5252
import androidx.core.app.ActivityCompat;
53+
import androidx.core.content.ContextCompat;
5354
import androidx.core.view.GravityCompat;
5455
import androidx.drawerlayout.widget.DrawerLayout;
5556
import androidx.fragment.app.Fragment;
@@ -892,7 +893,8 @@ public void onReceive(final Context context, final Intent intent) {
892893
};
893894
final IntentFilter intentFilter = new IntentFilter();
894895
intentFilter.addAction(VideoDetailFragment.ACTION_PLAYER_STARTED);
895-
registerReceiver(broadcastReceiver, intentFilter);
896+
ContextCompat.registerReceiver(this, broadcastReceiver, intentFilter,
897+
ContextCompat.RECEIVER_EXPORTED);
896898

897899
// If the PlayerHolder is not bound yet, but the service is running, try to bind to it.
898900
// Once the connection is established, the ACTION_PLAYER_STARTED will be sent.

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,8 @@ public void onReceive(final Context context, final Intent intent) {
14231423
intentFilter.addAction(ACTION_SHOW_MAIN_PLAYER);
14241424
intentFilter.addAction(ACTION_HIDE_MAIN_PLAYER);
14251425
intentFilter.addAction(ACTION_PLAYER_STARTED);
1426-
activity.registerReceiver(broadcastReceiver, intentFilter);
1426+
ContextCompat.registerReceiver(activity, broadcastReceiver, intentFilter,
1427+
ContextCompat.RECEIVER_EXPORTED);
14271428
}
14281429

14291430

app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.core.app.NotificationCompat
3131
import androidx.core.app.NotificationManagerCompat
3232
import androidx.core.app.PendingIntentCompat
3333
import androidx.core.app.ServiceCompat
34+
import androidx.core.content.ContextCompat
3435
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
3536
import io.reactivex.rxjava3.core.Flowable
3637
import io.reactivex.rxjava3.disposables.Disposable
@@ -200,7 +201,7 @@ class FeedLoadService : Service() {
200201
}
201202
}
202203
}
203-
registerReceiver(broadcastReceiver, IntentFilter(ACTION_CANCEL))
204+
ContextCompat.registerReceiver(this, broadcastReceiver, IntentFilter(ACTION_CANCEL), ContextCompat.RECEIVER_NOT_EXPORTED)
204205
}
205206

206207
// /////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/player/Player.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161

6262
import androidx.annotation.NonNull;
6363
import androidx.annotation.Nullable;
64+
import androidx.core.content.ContextCompat;
6465
import androidx.core.math.MathUtils;
6566
import androidx.preference.PreferenceManager;
6667

@@ -766,7 +767,8 @@ private void onBroadcastReceived(final Intent intent) {
766767
private void registerBroadcastReceiver() {
767768
// Try to unregister current first
768769
unregisterBroadcastReceiver();
769-
context.registerReceiver(broadcastReceiver, intentFilter);
770+
ContextCompat.registerReceiver(context, broadcastReceiver, intentFilter,
771+
ContextCompat.RECEIVER_EXPORTED);
770772
}
771773

772774
private void unregisterBroadcastReceiver() {

0 commit comments

Comments
 (0)