From c95e86d0d9acd071e97cd57c02edc154ac062050 Mon Sep 17 00:00:00 2001
From: dhk2 <donkimberlin@hotmail.com>
Date: Sun, 17 Jan 2021 13:13:32 -0800
Subject: [PATCH] fix issue #234 Making X in pip mode stop background audio
 properly

---
 .../peertube/activity/VideoPlayActivity.java  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index f73041c..0571fe9 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -71,6 +71,7 @@ public class VideoPlayActivity extends AppCompatActivity {
     private static final String TAG = "VideoPlayActivity";
 
     static boolean floatMode = false;
+    static boolean fullStop=true;
 
     private static final int REQUEST_CODE = 101;
     private BroadcastReceiver receiver;
@@ -138,6 +139,7 @@ public class VideoPlayActivity extends AppCompatActivity {
         receiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
+                fullStop=true;
                 String action = intent.getAction();
                 assert action != null;
                 if (action.equals(ACTION_PAUSE)) {
@@ -150,11 +152,12 @@ public class VideoPlayActivity extends AppCompatActivity {
                 }
 
                 if (action.equals(getString(R.string.app_background_audio))) {
-                    unregisterReceiver(receiver);
+                    safeUnregisterReceiver();
+                    fullStop=false;
                     finish();
                 }
                 if (action.equals(ACTION_STOP)) {
-                    unregisterReceiver(receiver);
+                    safeUnregisterReceiver();
                     finishAndRemoveTask();
                 }
             }
@@ -173,7 +176,7 @@ public class VideoPlayActivity extends AppCompatActivity {
         assert videoPlayerFragment != null;
         videoPlayerFragment.showControls(true);
         if (receiver != null) {
-            unregisterReceiver(receiver);
+            safeUnregisterReceiver();
         }
         Log.v(TAG, "switched to normal");
         floatMode = false;
@@ -333,9 +336,13 @@ public class VideoPlayActivity extends AppCompatActivity {
                 getSupportFragmentManager().findFragmentById(R.id.video_player_fragment);
 
         assert videoPlayerFragment != null;
-        videoPlayerFragment.stopVideo();
-
         Log.v(TAG, "onStop()...");
+        safeUnregisterReceiver();
+        if (fullStop) {
+            stopService(new Intent(this, VideoPlayerService.class));
+            finishAndRemoveTask();
+        }
+        finish();
     }
 
     @Override
@@ -498,5 +505,12 @@ public class VideoPlayActivity extends AppCompatActivity {
             Log.e(TAG, "videoPlayerFragment is NULL");
         }
     }
-
+    private void safeUnregisterReceiver()
+    {
+        try {
+            unregisterReceiver(receiver);
+        } catch (Exception e) {
+            Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
+        }
+    }
 }