Merge pull request #7568 from vhouriet/vhouriet_feature_already-playing-in-backgroud

Add Already playing in background toast

Author: litetex

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -168,10 +168,14 @@ public static void playOnPopupPlayer(final Context context,
     public static void playOnBackgroundPlayer(final Context context,
                                               final PlayQueue queue,
                                               final boolean resumePlayback) {
-        if (PlayerHolder.getInstance().getType() != MainPlayer.PlayerType.AUDIO) {
-            Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
-                    .show();
-        }
+        Toast.makeText(
+                context,
+                PlayerHolder.getInstance().getType() == PlayerType.AUDIO
+                    ? R.string.background_player_already_playing_toast
+                    : R.string.background_player_playing_toast,
+                Toast.LENGTH_SHORT)
+                .show();
+
         final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
         intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
         ContextCompat.startForegroundService(context, intent);

app/src/main/res/values/strings.xml

@@ -147,6 +147,7 @@
     <string name="settings_category_updates_title">Updates</string>
     <string name="settings_category_notification_title">Notification</string>
     <string name="background_player_playing_toast">Playing in background</string>
+    <string name="background_player_already_playing_toast">Already playing in background</string>
     <string name="popup_playing_toast">Playing in popup mode</string>
     <string name="content">Content</string>
     <string name="show_age_restricted_content_title">Show age restricted content</string>