Skip to content

Commit 1d5d243

Browse files
committed
Specify RECEIVER_EXPORTED/RECEIVER_NOT_EXPORTED for sdk34
1 parent c9155f7 commit 1d5d243

4 files changed

Lines changed: 24 additions & 4 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import android.content.IntentFilter;
2929
import android.content.SharedPreferences;
3030
import android.content.pm.PackageManager;
31+
import android.os.Build;
3132
import android.os.Bundle;
3233
import android.os.Handler;
3334
import android.os.Looper;
@@ -892,7 +893,11 @@ 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+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
897+
registerReceiver(broadcastReceiver, intentFilter, RECEIVER_NOT_EXPORTED);
898+
} else {
899+
registerReceiver(broadcastReceiver, intentFilter);
900+
}
896901

897902
// If the PlayerHolder is not bound yet, but the service is running, try to bind to it.
898903
// 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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.schabi.newpipe.fragments.detail;
22

3+
import static android.content.Context.RECEIVER_NOT_EXPORTED;
34
import static android.text.TextUtils.isEmpty;
45
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
56
import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
@@ -1423,7 +1424,11 @@ public void onReceive(final Context context, final Intent intent) {
14231424
intentFilter.addAction(ACTION_SHOW_MAIN_PLAYER);
14241425
intentFilter.addAction(ACTION_HIDE_MAIN_PLAYER);
14251426
intentFilter.addAction(ACTION_PLAYER_STARTED);
1426-
activity.registerReceiver(broadcastReceiver, intentFilter);
1427+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
1428+
activity.registerReceiver(broadcastReceiver, intentFilter, RECEIVER_NOT_EXPORTED);
1429+
} else {
1430+
activity.registerReceiver(broadcastReceiver, intentFilter);
1431+
}
14271432
}
14281433

14291434

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,11 @@ class FeedLoadService : Service() {
200200
}
201201
}
202202
}
203-
registerReceiver(broadcastReceiver, IntentFilter(ACTION_CANCEL))
203+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
204+
registerReceiver(broadcastReceiver, IntentFilter(ACTION_CANCEL), RECEIVER_NOT_EXPORTED)
205+
} else {
206+
registerReceiver(broadcastReceiver, IntentFilter(ACTION_CANCEL))
207+
}
204208
}
205209

206210
// /////////////////////////////////////////////////////////////////////////

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.schabi.newpipe.player;
22

3+
import static android.content.Context.RECEIVER_EXPORTED;
34
import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW;
45
import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS;
56
import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_IO_CLEARTEXT_NOT_PERMITTED;
@@ -55,6 +56,7 @@
5556
import android.graphics.Bitmap;
5657
import android.graphics.drawable.Drawable;
5758
import android.media.AudioManager;
59+
import android.os.Build;
5860
import android.support.v4.media.session.MediaSessionCompat;
5961
import android.util.Log;
6062
import android.view.LayoutInflater;
@@ -766,7 +768,11 @@ private void onBroadcastReceived(final Intent intent) {
766768
private void registerBroadcastReceiver() {
767769
// Try to unregister current first
768770
unregisterBroadcastReceiver();
769-
context.registerReceiver(broadcastReceiver, intentFilter);
771+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
772+
context.registerReceiver(broadcastReceiver, intentFilter, RECEIVER_EXPORTED);
773+
} else {
774+
context.registerReceiver(broadcastReceiver, intentFilter);
775+
}
770776
}
771777

772778
private void unregisterBroadcastReceiver() {

0 commit comments

Comments
 (0)