From 74199c862485cc698a6bc221d513b8fa78b7469e Mon Sep 17 00:00:00 2001
From: John Zhen Mo <zhenmogukl@gmail.com>
Date: Mon, 2 Apr 2018 22:11:53 -0700
Subject: [PATCH] -Designated background player as default media button
 receiver. -Fixed media button intent causing illegal state exception when
 sent from external apps.

---
 app/src/main/AndroidManifest.xml               |  6 +++++-
 .../newpipe/player/BackgroundPlayer.java       |  6 +++++-
 .../player/helper/MediaSessionManager.java     | 18 ++++++++++--------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7447c81ed..1e55270be 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,11 @@
 
         <service
             android:name=".player.BackgroundPlayer"
-            android:exported="false"/>
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
 
         <activity
             android:name=".player.BackgroundPlayerActivity"
diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
index ac070fb44..d7e2f5089 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -118,8 +118,12 @@ public final class BackgroundPlayer extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (DEBUG) Log.d(TAG, "onStartCommand() called with: intent = [" + intent + "], flags = [" + flags + "], startId = [" + startId + "]");
+        if (DEBUG) Log.d(TAG, "onStartCommand() called with: intent = [" + intent +
+                "], flags = [" + flags + "], startId = [" + startId + "]");
         basePlayerImpl.handleIntent(intent);
+        if (basePlayerImpl.mediaSessionManager != null) {
+            basePlayerImpl.mediaSessionManager.handleMediaButtonIntent(intent);
+        }
         return START_NOT_STICKY;
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
index 8405e45fd..2611705a8 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
@@ -1,8 +1,12 @@
 package org.schabi.newpipe.player.helper;
 
 import android.content.Context;
+import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.media.session.MediaButtonReceiver;
 import android.support.v4.media.session.MediaSessionCompat;
+import android.view.KeyEvent;
 
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
@@ -15,8 +19,8 @@ import org.schabi.newpipe.player.mediasession.PlayQueuePlaybackController;
 public class MediaSessionManager {
     private static final String TAG = "MediaSessionManager";
 
-    private final MediaSessionCompat mediaSession;
-    private final MediaSessionConnector sessionConnector;
+    @NonNull private final MediaSessionCompat mediaSession;
+    @NonNull private final MediaSessionConnector sessionConnector;
 
     public MediaSessionManager(@NonNull final Context context,
                                @NonNull final Player player,
@@ -28,11 +32,9 @@ public class MediaSessionManager {
         this.sessionConnector.setPlayer(player, new DummyPlaybackPreparer());
     }
 
-    public MediaSessionCompat getMediaSession() {
-        return mediaSession;
-    }
-
-    public MediaSessionConnector getSessionConnector() {
-        return sessionConnector;
+    @Nullable
+    @SuppressWarnings("UnusedReturnValue")
+    public KeyEvent handleMediaButtonIntent(final Intent intent) {
+        return MediaButtonReceiver.handleIntent(mediaSession, intent);
     }
 }