Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7614 from litetex/revert-7568 

Revert #7568
This commit is contained in:
Stypox 2022-01-23 15:54:55 +01:00 committed by GitHub
parent 9f503917c2 e127db6fa6
commit 1531a5112c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
View File

@ -157,9 +157,8 @@ public final class NavigationHelper {
return; return;
} }
if (PlayerHolder.getInstance().getType() != PlayerType.POPUP) {
Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show(); Toast.makeText(context, R.string.popup_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.POPUP.ordinal()); intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
ContextCompat.startForegroundService(context, intent); ContextCompat.startForegroundService(context, intent);
@ -168,12 +167,7 @@ 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( Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
context,
PlayerHolder.getInstance().getType() == PlayerType.AUDIO
? R.string.background_player_already_playing_toast
: R.string.background_player_playing_toast,
Toast.LENGTH_SHORT)
.show(); .show();
final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback); final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);

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>