Fix regression: Unable to find explicit activity class

See #3114 (comment) for info on this crash. This reverts ef90493 partly.
TeamNewPipe · Feb 22, 2020 · 0bc769b · 0bc769b
1 parent 5b98d41
commit 0bc769b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
@@ -55,7 +55,13 @@ public boolean onPlayerOptionSelected(MenuItem item) {
                 return true;
             }
 
-            return switchTo(PopupVideoPlayer.class);
+            this.player.setRecovery();
+            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+            getApplicationContext().startService(
+                getSwitchIntent(PopupVideoPlayer.class)
+                    .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+            );
+            return true;
         }
         return false;
     }

diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
@@ -48,7 +48,13 @@ public int getPlayerOptionMenuResource() {
     @Override
     public boolean onPlayerOptionSelected(MenuItem item) {
         if (item.getItemId() == R.id.action_switch_background) {
-            return switchTo(BackgroundPlayer.class);
+            this.player.setRecovery();
+            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+            getApplicationContext().startService(
+                getSwitchIntent(BackgroundPlayer.class)
+                    .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+            );
+            return true;
         }
         return false;
     }

diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -166,7 +166,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
                 return true;
             case R.id.action_switch_main:
-                return switchTo(MainVideoPlayer.class);
+                this.player.setRecovery();
+                getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+                getApplicationContext().startActivity(
+                    getSwitchIntent(MainVideoPlayer.class)
+                        .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+                );
+                return true;
         }
         return onPlayerOptionSelected(item) || super.onOptionsItemSelected(item);
     }
@@ -190,14 +196,7 @@ protected Intent getSwitchIntent(final Class clazz) {
                 false,
                 false
         ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying());
-    }
-
-    protected boolean switchTo(final Class clazz) {
-        this.player.setRecovery();
-        getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
-        getApplicationContext().startActivity(getSwitchIntent(clazz));
-        return true;
+                .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying());
     }
 
     ////////////////////////////////////////////////////////////////////////////