Skip to content

Fix #1795: Persist shuffle and repeat mode across sessions #12701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+40 −0
Open

Fix #1795: Persist shuffle and repeat mode across sessions #12701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions app/src/main/java/org/schabi/newpipe/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ public final class Player implements PlaybackListener, Listener {

public static final int RENDERER_UNAVAILABLE = -1;
private static final String PICASSO_PLAYER_THUMBNAIL_TAG = "PICASSO_PLAYER_THUMBNAIL_TAG";
private static final String PREF_KEY_SHUFFLE_ENABLED = "player_shuffle_enabled";
private static final String PREF_KEY_REPEAT_MODE = "player_repeat_mode";

/*//////////////////////////////////////////////////////////////////////////
// Playback
Expand Down Expand Up @@ -617,6 +619,22 @@ private void initPlayback(@NonNull final PlayQueue queue,
playQueue.init();
reloadPlayQueueManager();

final int persistedRepeat = loadRepeatFromPrefs();
final boolean persistedShuffle = loadShuffleFromPrefs();

simpleExoPlayer.setRepeatMode(persistedRepeat);
simpleExoPlayer.setShuffleModeEnabled(persistedShuffle);

if (persistedShuffle && !playQueue.isShuffled()) {
playQueue.shuffle();
} else if (!persistedShuffle && playQueue.isShuffled()) {
playQueue.unshuffle();
}

UIs.call(ui -> ui.onRepeatModeChanged(persistedRepeat));
UIs.call(ui -> ui.onShuffleModeEnabledChanged(persistedShuffle));
notifyPlaybackUpdateToListeners();

UIs.call(PlayerUi::initPlayback);

simpleExoPlayer.setVolume(isMuted() ? 0 : 1);
Expand Down Expand Up @@ -1263,6 +1281,23 @@ private void onCompleted() {
//////////////////////////////////////////////////////////////////////////*/
//region Repeat and shuffle

private void saveShuffleToPrefs(final boolean enabled) {
prefs.edit().putBoolean(PREF_KEY_SHUFFLE_ENABLED, enabled).apply();
}

private void saveRepeatToPrefs(@RepeatMode final int repeatMode) {
prefs.edit().putInt(PREF_KEY_REPEAT_MODE, repeatMode).apply();
}

private boolean loadShuffleFromPrefs() {
return prefs.getBoolean(PREF_KEY_SHUFFLE_ENABLED, false);
}

@RepeatMode
private int loadRepeatFromPrefs() {
return prefs.getInt(PREF_KEY_REPEAT_MODE, REPEAT_MODE_OFF);
}

@RepeatMode
public int getRepeatMode() {
return exoPlayerIsNull() ? REPEAT_MODE_OFF : simpleExoPlayer.getRepeatMode();
Expand Down Expand Up @@ -1293,6 +1328,9 @@ public void onRepeatModeChanged(@RepeatMode final int repeatMode) {
Log.d(TAG, "ExoPlayer - onRepeatModeChanged() called with: "
+ "repeatMode = [" + repeatMode + "]");
}

saveRepeatToPrefs(repeatMode);

UIs.call(playerUi -> playerUi.onRepeatModeChanged(repeatMode));
notifyPlaybackUpdateToListeners();
}
Expand All @@ -1304,6 +1342,8 @@ public void onShuffleModeEnabledChanged(final boolean shuffleModeEnabled) {
+ "mode = [" + shuffleModeEnabled + "]");
}

saveShuffleToPrefs(shuffleModeEnabled);

if (playQueue != null) {
if (shuffleModeEnabled) {
playQueue.shuffle();
Expand Down