Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dependency from MediaButtonReceiver to PlaybackService

This commit is contained in:
ByteHamster 2022-11-03 23:16:42 +01:00
parent 5b8cee0de0
commit 70a847f6ba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/AndroidManifest.xml
View File

@ -28,6 +28,7 @@
<intent-filter> <intent-filter>
<action android:name="android.media.browse.MediaBrowserService"/> <action android:name="android.media.browse.MediaBrowserService"/>
<action android:name="de.danoeh.antennapod.intents.PLAYBACK_SERVICE" />
</intent-filter> </intent-filter>
</service> </service>

5
core/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java
View File

@ -10,7 +10,6 @@ import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import de.danoeh.antennapod.core.ClientConfigurator; import de.danoeh.antennapod.core.ClientConfigurator;
import de.danoeh.antennapod.core.service.playback.PlaybackService;
/** /**
* Receives media button events. * Receives media button events.
@ -22,6 +21,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
public static final String EXTRA_HARDWAREBUTTON public static final String EXTRA_HARDWAREBUTTON
= "de.danoeh.antennapod.core.service.extra.MediaButtonReceiver.HARDWAREBUTTON"; = "de.danoeh.antennapod.core.service.extra.MediaButtonReceiver.HARDWAREBUTTON";
public static final String NOTIFY_BUTTON_RECEIVER = "de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER"; public static final String NOTIFY_BUTTON_RECEIVER = "de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER";
public static final String PLAYBACK_SERVICE_INTENT = "de.danoeh.antennapod.intents.PLAYBACK_SERVICE";
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -32,7 +32,8 @@ public class MediaButtonReceiver extends BroadcastReceiver {
KeyEvent event = (KeyEvent) intent.getExtras().get(Intent.EXTRA_KEY_EVENT); KeyEvent event = (KeyEvent) intent.getExtras().get(Intent.EXTRA_KEY_EVENT);
if (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) { if (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {
ClientConfigurator.initialize(context); ClientConfigurator.initialize(context);
Intent serviceIntent = new Intent(context, PlaybackService.class); Intent serviceIntent = new Intent(PLAYBACK_SERVICE_INTENT);
serviceIntent.setPackage(context.getPackageName());
serviceIntent.putExtra(EXTRA_KEYCODE, event.getKeyCode()); serviceIntent.putExtra(EXTRA_KEYCODE, event.getKeyCode());
serviceIntent.putExtra(EXTRA_SOURCE, event.getSource()); serviceIntent.putExtra(EXTRA_SOURCE, event.getSource());
serviceIntent.putExtra(EXTRA_HARDWAREBUTTON, event.getEventTime() > 0 || event.getDownTime() > 0); serviceIntent.putExtra(EXTRA_HARDWAREBUTTON, event.getEventTime() > 0 || event.getDownTime() > 0);