baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

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

Browse source 
This reverts commit ee19ea66b3, reversing
changes made to 6b490ee547.
This commit is contained in:
litetex 2022-01-03 15:00:30 +01:00
parent 9f503917c2
commit 49b1649348
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
View file

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

1
app/src/main/res/values/strings.xml
View file

@ -143,7 +143,6 @@
<string name="settings_category_updates_title">Updates</string> <string name="settings_category_updates_title">Updates</string>
<string name="settings_category_notification_title">Notification</string> <string name="settings_category_notification_title">Notification</string>
<string name="background_player_playing_toast">Playing in background</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="popup_playing_toast">Playing in popup mode</string>
<string name="content">Content</string> <string name="content">Content</string>
<string name="show_age_restricted_content_title">Show age restricted content</string> <string name="show_age_restricted_content_title">Show age restricted content</string>