From 979bd09b29ff8326ef875ae158c8f895d89b35bc Mon Sep 17 00:00:00 2001
From: John Zhen Mo <zhenmogukl@gmail.com>
Date: Tue, 14 Nov 2017 10:13:36 -0800
Subject: [PATCH] -Fixed popup player not in foreground when opened by external
 intent. -Fixed popup overlay permission causing exception when opened
 externally.

---
 app/src/main/AndroidManifest.xml                   |  2 +-
 .../org/schabi/newpipe/RouterPopupActivity.java    |  1 +
 .../schabi/newpipe/player/PopupVideoPlayer.java    | 14 +++++++++-----
 app/src/main/res/values/styles.xml                 |  8 ++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f97a7201..dab6fb2ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -185,7 +185,7 @@
             android:name=".RouterPopupActivity"
             android:label="@string/popup_mode_share_menu_title"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.NoDisplay">
+            android:theme="@style/PopupPermissionsTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
diff --git a/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java b/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java
index 1cff0ca76..2e7089300 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java
@@ -21,6 +21,7 @@ public class RouterPopupActivity extends RouterActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                 && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
             Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            finish();
             return;
         }
         StreamingService service;
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index a3fd0f7a7..5f8b36449 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -842,6 +842,8 @@ public final class PopupVideoPlayer extends Service {
                 }
                 savePositionAndSize();
             }
+
+            v.performClick();
             return true;
         }
 
@@ -880,23 +882,25 @@ public final class PopupVideoPlayer extends Service {
         private final Context context;
         private final Handler mainHandler;
 
-        FetcherHandler(Context context, int serviceId, String url) {
+        private FetcherHandler(Context context, int serviceId, String url) {
             this.mainHandler = new Handler(PopupVideoPlayer.this.getMainLooper());
             this.context = context;
             this.url = url;
             this.serviceId = serviceId;
         }
 
-        /*package-private*/ void onReceive(final StreamInfo info) {
+        private void onReceive(final StreamInfo info) {
             mainHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    playerImpl.initPlayback(new SinglePlayQueue(info));
+                    final Intent intent = NavigationHelper.getPlayerIntent(getApplicationContext(),
+                            PopupVideoPlayer.class, new SinglePlayQueue(info));
+                    playerImpl.handleIntent(intent);
                 }
             });
         }
 
-        protected void onError(final Throwable exception) {
+        private void onError(final Throwable exception) {
             if (DEBUG) Log.d(TAG, "onError() called with: exception = [" + exception + "]");
             exception.printStackTrace();
             mainHandler.post(new Runnable() {
@@ -922,7 +926,7 @@ public final class PopupVideoPlayer extends Service {
             stopSelf();
         }
 
-        /*package-private*/ void onReCaptchaException() {
+        private void onReCaptchaException() {
             Toast.makeText(context, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
             // Starting ReCaptcha Challenge Activity
             Intent intent = new Intent(context, ReCaptchaActivity.class);
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8f0bb02cd..d69bba254 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -160,4 +160,12 @@
         <item name="android:background">@color/dark_youtube_primary_color</item>
     </style>
 
+    <style name="PopupPermissionsTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowNoDisplay">true</item>
+    </style>
 </resources>