Remove SimplifyOptionalCallChains.

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -255,11 +255,8 @@ public final class VideoDetailFragment
             playerUi.ifPresent(MainPlayerUi::toggleFullscreen);
         }
 
-        //noinspection SimplifyOptionalCallChains
+        if (playAfterConnect || (currentInfo != null && isAutoplayEnabled()
-        if (playAfterConnect
+                && playerUi.isEmpty())) {
-                || (currentInfo != null
-                && isAutoplayEnabled()
-                && !playerUi.isPresent())) {
             autoPlayEnabled = true; // forcefully start playing
             openVideoPlayerAutoFullscreen();
         }
@@ -1174,16 +1171,15 @@ public final class VideoDetailFragment
      * be reused in a few milliseconds and the flickering would be annoying.
      */
     private void hideMainPlayerOnLoadingNewStream() {
-        //noinspection SimplifyOptionalCallChains
+        final var root = getRoot();
-        if (!isPlayerServiceAvailable() || !getRoot().isPresent()
+        if (!isPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
-                || !player.videoPlayerSelected()) {
             return;
         }
 
         removeVideoPlayerView();
         if (isAutoplayEnabled()) {
             playerService.stopForImmediateReusing();
-            getRoot().ifPresent(view -> view.setVisibility(View.GONE));
+            root.ifPresent(view -> view.setVisibility(View.GONE));
         } else {
             playerHolder.stopService();
         }
@@ -1887,10 +1883,8 @@ public final class VideoDetailFragment
     @Override
     public void onFullscreenStateChanged(final boolean fullscreen) {
         setupBrightness();
-        //noinspection SimplifyOptionalCallChains
+        if (!isPlayerAndPlayerServiceAvailable() || player.UIs().get(MainPlayerUi.class).isEmpty()
-        if (!isPlayerAndPlayerServiceAvailable()
+                || getRoot().map(View::getParent).isEmpty()) {
-                || !player.UIs().get(MainPlayerUi.class).isPresent()
-                || getRoot().map(View::getParent).orElse(null) == null) {
             return;
         }
 

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

@@ -1695,26 +1695,25 @@ public final class Player implements PlaybackListener, Listener {
     }
 
     private void saveStreamProgressState(final long progressMillis) {
-        //noinspection SimplifyOptionalCallChains
+        getCurrentStreamInfo().ifPresent(info -> {
-        if (!getCurrentStreamInfo().isPresent()
+            if (!prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) {
-                || !prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) {
+                return;
-            return;
+            }
-        }
+            if (DEBUG) {
-        if (DEBUG) {
+                Log.d(TAG, "saveStreamProgressState() called with: progressMillis=" + progressMillis
-            Log.d(TAG, "saveStreamProgressState() called with: progressMillis=" + progressMillis
+                        + ", currentMetadata=[" + info.getName() + "]");
-                    + ", currentMetadata=[" + getCurrentStreamInfo().get().getName() + "]");
+            }
-        }
 
-        databaseUpdateDisposable
+            databaseUpdateDisposable.add(recordManager.saveStreamState(info, progressMillis)
-                .add(recordManager.saveStreamState(getCurrentStreamInfo().get(), progressMillis)
+                    .observeOn(AndroidSchedulers.mainThread())
-                .observeOn(AndroidSchedulers.mainThread())
+                    .doOnError(e -> {
-                .doOnError(e -> {
+                        if (DEBUG) {
-                    if (DEBUG) {
+                            e.printStackTrace();
-                        e.printStackTrace();
+                        }
-                    }
+                    })
-                })
+                    .onErrorComplete()
-                .onErrorComplete()
+                    .subscribe());
-                .subscribe());
+        });
     }
 
     public void saveStreamProgressState() {
@@ -2036,40 +2035,35 @@ public final class Player implements PlaybackListener, Listener {
         // in livestreams) so we will be not able to execute the block below.
         // Reload the play queue manager in this case, which is the behavior when we don't know the
         // index of the video renderer or playQueueManagerReloadingNeeded returns true.
-        final Optional<StreamInfo> optCurrentStreamInfo = getCurrentStreamInfo();
+        getCurrentStreamInfo().ifPresentOrElse(info -> {
-        if (!optCurrentStreamInfo.isPresent()) {
+            // In the case we don't know the source type, fallback to the one with video with audio
-            reloadPlayQueueManager();
+            // or audio-only source.
-            setRecovery();
+            final SourceType sourceType = videoResolver.getStreamSourceType()
-            return;
+                    .orElse(SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY);
-        }
 
-        final StreamInfo info = optCurrentStreamInfo.get();
+            if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) {
+                reloadPlayQueueManager();
+            } else {
+                if (StreamTypeUtil.isAudio(info.getStreamType())) {
+                    // Nothing to do more than setting the recovery position
+                    setRecovery();
+                    return;
+                }
 
-        // In the case we don't know the source type, fallback to the one with video with audio or
+                final var parametersBuilder = trackSelector.buildUponParameters();
-        // audio-only source.
-        final SourceType sourceType = videoResolver.getStreamSourceType().orElse(
-                SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY);
 
-        if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) {
+                // Enable/disable the video track and the ability to select subtitles
-            reloadPlayQueueManager();
+                parametersBuilder.setTrackTypeDisabled(C.TRACK_TYPE_TEXT, !videoEnabled);
-        } else {
+                parametersBuilder.setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, !videoEnabled);
-            if (StreamTypeUtil.isAudio(info.getStreamType())) {
+
-                // Nothing to do more than setting the recovery position
+                trackSelector.setParameters(parametersBuilder);
-                setRecovery();
-                return;
             }
 
-            final DefaultTrackSelector.Parameters.Builder parametersBuilder =
+            setRecovery();
-                    trackSelector.buildUponParameters();
+        }, () -> {
-
+            reloadPlayQueueManager();
-            // Enable/disable the video track and the ability to select subtitles
+            setRecovery();
-            parametersBuilder.setTrackTypeDisabled(C.TRACK_TYPE_TEXT, !videoEnabled);
+        });
-            parametersBuilder.setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, !videoEnabled);
-
-            trackSelector.setParameters(parametersBuilder);
-        }
-
-        setRecovery();
     }
 
     /**

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -423,7 +423,7 @@ public class MediaSourceManager {
     private Single<ManagedMediaSource> getLoadedMediaSource(@NonNull final PlayQueueItem stream) {
         return stream.getStream().map(streamInfo -> {
             final MediaSource source = playbackListener.sourceOf(stream, streamInfo);
-            if (source == null || !MediaItemTag.from(source.getMediaItem()).isPresent()) {
+            if (source == null || MediaItemTag.from(source.getMediaItem()).isEmpty()) {
                 final String message = "Unable to resolve source from stream info. "
                         + "URL: " + stream.getUrl() + ", "
                         + "audio count: " + streamInfo.getAudioStreams().size() + ", "

app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.graphics.BitmapCompat;
 import androidx.core.math.MathUtils;
 import androidx.preference.PreferenceManager;
@@ -16,7 +17,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.DeviceUtils;
 
 import java.lang.annotation.Retention;
-import java.util.Optional;
 import java.util.function.IntSupplier;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -66,21 +66,19 @@ public final class SeekbarPreviewThumbnailHelper {
 
     public static void tryResizeAndSetSeekbarPreviewThumbnail(
             @NonNull final Context context,
-            @NonNull final Optional<Bitmap> optPreviewThumbnail,
+            @Nullable final Bitmap previewThumbnail,
             @NonNull final ImageView currentSeekbarPreviewThumbnail,
             @NonNull final IntSupplier baseViewWidthSupplier) {
-
+        if (previewThumbnail == null) {
-        if (!optPreviewThumbnail.isPresent()) {
             currentSeekbarPreviewThumbnail.setVisibility(View.GONE);
             return;
         }
 
         currentSeekbarPreviewThumbnail.setVisibility(View.VISIBLE);
-        final Bitmap srcBitmap = optPreviewThumbnail.get();
 
         // Resize original bitmap
         try {
-            final int srcWidth = srcBitmap.getWidth() > 0 ? srcBitmap.getWidth() : 1;
+            final int srcWidth = previewThumbnail.getWidth() > 0 ? previewThumbnail.getWidth() : 1;
             final int newWidth = MathUtils.clamp(
                     // Use 1/4 of the width for the preview
                     Math.round(baseViewWidthSupplier.getAsInt() / 4f),
@@ -90,15 +88,16 @@ public final class SeekbarPreviewThumbnailHelper {
                     Math.round(srcWidth * 2.5f));
 
             final float scaleFactor = (float) newWidth / srcWidth;
-            final int newHeight = (int) (srcBitmap.getHeight() * scaleFactor);
+            final int newHeight = (int) (previewThumbnail.getHeight() * scaleFactor);
 
-            currentSeekbarPreviewThumbnail.setImageBitmap(BitmapCompat.createScaledBitmap(srcBitmap,
+            currentSeekbarPreviewThumbnail.setImageBitmap(
-                    newWidth, newHeight, null, true));
+                    BitmapCompat.createScaledBitmap(previewThumbnail, newWidth, newHeight, null,
+                            true));
         } catch (final Exception ex) {
             Log.e(TAG, "Failed to resize and set seekbar preview thumbnail", ex);
             currentSeekbarPreviewThumbnail.setVisibility(View.GONE);
         } finally {
-            srcBitmap.recycle();
+            previewThumbnail.recycle();
         }
     }
 }

app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java

@@ -74,6 +74,7 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -746,15 +747,10 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
     }
 
     private int getNearestStreamSegmentPosition(final long playbackPosition) {
-        //noinspection SimplifyOptionalCallChains
-        if (!player.getCurrentStreamInfo().isPresent()) {
-            return 0;
-        }
-
         int nearestPosition = 0;
         final List<StreamSegment> segments = player.getCurrentStreamInfo()
-                .get()
+                .map(StreamInfo::getStreamSegments)
-                .getStreamSegments();
+                .orElse(Collections.emptyList());
 
         for (int i = 0; i < segments.size(); i++) {
             if (segments.get(i).getStartTimeSeconds() * 1000L > playbackPosition) {

app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java

@@ -566,7 +566,7 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
         SeekbarPreviewThumbnailHelper
                 .tryResizeAndSetSeekbarPreviewThumbnail(
                         player.getContext(),
-                        seekbarPreviewThumbnailHolder.getBitmapAt(progress),
+                        seekbarPreviewThumbnailHolder.getBitmapAt(progress).orElse(null),
                         binding.currentSeekbarPreviewThumbnail,
                         binding.subtitleView::getWidth);
 
@@ -982,61 +982,56 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
     }
 
     private void updateStreamRelatedViews() {
-        //noinspection SimplifyOptionalCallChains
+        player.getCurrentStreamInfo().ifPresent(info -> {
-        if (!player.getCurrentStreamInfo().isPresent()) {
+            binding.qualityTextView.setVisibility(View.GONE);
-            return;
+            binding.playbackSpeed.setVisibility(View.GONE);
-        }
-        final StreamInfo info = player.getCurrentStreamInfo().get();
 
-        binding.qualityTextView.setVisibility(View.GONE);
+            binding.playbackEndTime.setVisibility(View.GONE);
-        binding.playbackSpeed.setVisibility(View.GONE);
+            binding.playbackLiveSync.setVisibility(View.GONE);
 
-        binding.playbackEndTime.setVisibility(View.GONE);
+            switch (info.getStreamType()) {
-        binding.playbackLiveSync.setVisibility(View.GONE);
+                case AUDIO_STREAM:
-
+                case POST_LIVE_AUDIO_STREAM:
-        switch (info.getStreamType()) {
+                    binding.surfaceView.setVisibility(View.GONE);
-            case AUDIO_STREAM:
+                    binding.endScreen.setVisibility(View.VISIBLE);
-            case POST_LIVE_AUDIO_STREAM:
+                    binding.playbackEndTime.setVisibility(View.VISIBLE);
-                binding.surfaceView.setVisibility(View.GONE);
-                binding.endScreen.setVisibility(View.VISIBLE);
-                binding.playbackEndTime.setVisibility(View.VISIBLE);
-                break;
-
-            case AUDIO_LIVE_STREAM:
-                binding.surfaceView.setVisibility(View.GONE);
-                binding.endScreen.setVisibility(View.VISIBLE);
-                binding.playbackLiveSync.setVisibility(View.VISIBLE);
-                break;
-
-            case LIVE_STREAM:
-                binding.surfaceView.setVisibility(View.VISIBLE);
-                binding.endScreen.setVisibility(View.GONE);
-                binding.playbackLiveSync.setVisibility(View.VISIBLE);
-                break;
-
-            case VIDEO_STREAM:
-            case POST_LIVE_STREAM:
-                //noinspection SimplifyOptionalCallChains
-                if (player.getCurrentMetadata() != null
-                        && !player.getCurrentMetadata().getMaybeQuality().isPresent()
-                        || (info.getVideoStreams().isEmpty()
-                        && info.getVideoOnlyStreams().isEmpty())) {
                     break;
-                }
 
-                buildQualityMenu();
+                case AUDIO_LIVE_STREAM:
+                    binding.surfaceView.setVisibility(View.GONE);
+                    binding.endScreen.setVisibility(View.VISIBLE);
+                    binding.playbackLiveSync.setVisibility(View.VISIBLE);
+                    break;
 
-                binding.qualityTextView.setVisibility(View.VISIBLE);
+                case LIVE_STREAM:
-                binding.surfaceView.setVisibility(View.VISIBLE);
+                    binding.surfaceView.setVisibility(View.VISIBLE);
-                // fallthrough
+                    binding.endScreen.setVisibility(View.GONE);
-            default:
+                    binding.playbackLiveSync.setVisibility(View.VISIBLE);
-                binding.endScreen.setVisibility(View.GONE);
+                    break;
-                binding.playbackEndTime.setVisibility(View.VISIBLE);
-                break;
-        }
 
-        buildPlaybackSpeedMenu();
+                case VIDEO_STREAM:
-        binding.playbackSpeed.setVisibility(View.VISIBLE);
+                case POST_LIVE_STREAM:
+                    if (player.getCurrentMetadata() != null
+                            && player.getCurrentMetadata().getMaybeQuality().isEmpty()
+                            || (info.getVideoStreams().isEmpty()
+                            && info.getVideoOnlyStreams().isEmpty())) {
+                        break;
+                    }
+
+                    buildQualityMenu();
+
+                    binding.qualityTextView.setVisibility(View.VISIBLE);
+                    binding.surfaceView.setVisibility(View.VISIBLE);
+                    // fallthrough
+                default:
+                    binding.endScreen.setVisibility(View.GONE);
+                    binding.playbackEndTime.setVisibility(View.VISIBLE);
+                    break;
+            }
+
+            buildPlaybackSpeedMenu();
+            binding.playbackSpeed.setVisibility(View.VISIBLE);
+        });
     }
     //endregion
 
@@ -1198,8 +1193,7 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
         if (menuItem.getGroupId() == POPUP_MENU_ID_QUALITY) {
             final int menuItemIndex = menuItem.getItemId();
             @Nullable final MediaItemTag currentMetadata = player.getCurrentMetadata();
-            //noinspection SimplifyOptionalCallChains
+            if (currentMetadata == null || currentMetadata.getMaybeQuality().isEmpty()) {
-            if (currentMetadata == null || !currentMetadata.getMaybeQuality().isPresent()) {
                 return true;
             }
 
@@ -1300,9 +1294,8 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
 
         // Build UI
         buildCaptionMenu(availableLanguages);
-        //noinspection SimplifyOptionalCallChains
         if (player.getTrackSelector().getParameters().getRendererDisabled(
-                player.getCaptionRendererIndex()) || !selectedTracks.isPresent()) {
+                player.getCaptionRendererIndex()) || selectedTracks.isEmpty()) {
             binding.captionTextView.setText(R.string.caption_none);
         } else {
             binding.captionTextView.setText(selectedTracks.get().language);