Player/handleIntent: move prefs parameters into initPlayback

They are just read from the player preferences and don’t influence the
branching, no need to read them in the intent parsing logic.

Author: Profpatsch

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -387,12 +387,6 @@ public void handleIntent(@NonNull final Intent intent) {
             }
         }
 
-        // initPlayback Parameters
-        final PlaybackParameters savedParameters = retrievePlaybackParametersFromPrefs(this);
-        final float playbackSpeed = savedParameters.speed;
-        final float playbackPitch = savedParameters.pitch;
-        final boolean playbackSkipSilence = getPrefs().getBoolean(getContext().getString(
-                R.string.playback_skip_silence_key), getPlaybackSkipSilence());
         final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
 
         // branching parameters for below
@@ -454,28 +448,24 @@ public void handleIntent(@NonNull final Intent intent) {
                                     newQueue.setRecovery(newQueue.getIndex(),
                                             state.getProgressMillis());
                                 }
-                                initPlayback(newQueue, playbackSpeed, playbackPitch,
-                                        playbackSkipSilence, playWhenReady);
+                                initPlayback(newQueue, playWhenReady);
                             },
                             error -> {
                                 if (DEBUG) {
                                     Log.w(TAG, "Failed to start playback", error);
                                 }
                                 // In case any error we can start playback without history
-                                initPlayback(newQueue, playbackSpeed, playbackPitch,
-                                        playbackSkipSilence, playWhenReady);
+                                initPlayback(newQueue, playWhenReady);
                             },
                             () -> {
                                 // Completed but not found in history
-                                initPlayback(newQueue, playbackSpeed, playbackPitch,
-                                        playbackSkipSilence, playWhenReady);
+                                initPlayback(newQueue, playWhenReady);
                             }
                     ));
         } else {
             // Good to go...
             // In a case of equal PlayQueues we can re-init old one but only when it is disposed
-            initPlayback(samePlayQueue ? playQueue : newQueue, playbackSpeed,
-                    playbackPitch, playbackSkipSilence, playWhenReady);
+            initPlayback(samePlayQueue ? playQueue : newQueue, playWhenReady);
         }
 
         if (oldPlayerType != playerType && playQueue != null) {
@@ -521,13 +511,13 @@ private void initUIsForCurrentPlayerType() {
     }
 
     private void initPlayback(@NonNull final PlayQueue queue,
-                              final float playbackSpeed,
-                              final float playbackPitch,
-                              final boolean playbackSkipSilence,
                               final boolean playOnReady) {
         destroyPlayer();
         initPlayer(playOnReady);
-        setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
+        final boolean playbackSkipSilence = getPrefs().getBoolean(getContext().getString(
+                R.string.playback_skip_silence_key), getPlaybackSkipSilence());
+        final PlaybackParameters savedParameters = retrievePlaybackParametersFromPrefs(this);
+        setPlaybackParameters(savedParameters.speed, savedParameters.pitch, playbackSkipSilence);
 
         playQueue = queue;
         playQueue.init();