From 2834a73cdc12c7ef27a5ce8557d6f548e67b336e Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Wed, 11 Jan 2023 19:49:53 +0530 Subject: [PATCH] Use Optional.map() instead of flatMap(). --- .../schabi/newpipe/fragments/detail/VideoDetailFragment.java | 2 +- .../org/schabi/newpipe/player/mediaitem/MediaItemTag.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index 1fb6b585908..601135cbb59 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -1887,7 +1887,7 @@ public void onFullscreenStateChanged(final boolean fullscreen) { setupBrightness(); if (!isPlayerAndPlayerServiceAvailable() || player.UIs().get(MainPlayerUi.class).isEmpty() - || getRoot().flatMap(v -> Optional.ofNullable(v.getParent())).isEmpty()) { + || getRoot().map(View::getParent).isEmpty()) { return; } diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java index 4f808caaca0..f08086287f5 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java @@ -62,8 +62,8 @@ default Optional getMaybeQuality() { @NonNull static Optional from(@Nullable final MediaItem mediaItem) { return Optional.ofNullable(mediaItem) - .flatMap(item -> Optional.ofNullable(item.localConfiguration)) - .flatMap(localConfiguration -> Optional.ofNullable(localConfiguration.tag)) + .map(item -> item.localConfiguration) + .map(localConfiguration -> localConfiguration.tag) .filter(MediaItemTag.class::isInstance) .map(MediaItemTag.class::cast); }