From a0bed5e739e5bb97df14652940c8672d207fb524 Mon Sep 17 00:00:00 2001 From: Grishka Date: Fri, 21 Jun 2024 20:48:37 -0300 Subject: [PATCH] fix: cherrypick a patch for the Sdk 34 from upstream --- mastodon/src/main/AndroidManifest.xml | 3 ++- .../org/joinmastodon/android/AudioPlayerService.java | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mastodon/src/main/AndroidManifest.xml b/mastodon/src/main/AndroidManifest.xml index cd80f1ed2..6fed73c8c 100644 --- a/mastodon/src/main/AndroidManifest.xml +++ b/mastodon/src/main/AndroidManifest.xml @@ -5,7 +5,8 @@ - + + diff --git a/mastodon/src/main/java/org/joinmastodon/android/AudioPlayerService.java b/mastodon/src/main/java/org/joinmastodon/android/AudioPlayerService.java index 067446d3e..94f06fc17 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/AudioPlayerService.java +++ b/mastodon/src/main/java/org/joinmastodon/android/AudioPlayerService.java @@ -88,8 +88,13 @@ public class AudioPlayerService extends Service{ nm=getSystemService(NotificationManager.class); // registerReceiver(receiver, new IntentFilter(Intent.ACTION_MEDIA_BUTTON)); registerReceiver(receiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)); - registerReceiver(receiver, new IntentFilter(ACTION_PLAY_PAUSE)); - registerReceiver(receiver, new IntentFilter(ACTION_STOP)); + if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.TIRAMISU){ + registerReceiver(receiver, new IntentFilter(ACTION_PLAY_PAUSE), RECEIVER_EXPORTED); + registerReceiver(receiver, new IntentFilter(ACTION_STOP), RECEIVER_EXPORTED); + }else{ + registerReceiver(receiver, new IntentFilter(ACTION_PLAY_PAUSE)); + registerReceiver(receiver, new IntentFilter(ACTION_STOP)); + } instance=this; }