Skip to content

Commit ad605e2

Browse files
committed
Actually there is no need to use flatMap
`null` values returned in the lambda are converted to empty `Optional`s in the `map` method: https://developer.android.com/reference/java/util/Optional#map(java.util.function.Function%3C?%20super%20T,%20?%20extends%20U%3E)
1 parent eed44b3 commit ad605e2

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

app/src/main/java/org/schabi/newpipe/RouterActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
import org.schabi.newpipe.views.FocusOverlayView;
8888

8989
import java.io.Serializable;
90+
import java.lang.ref.Reference;
9091
import java.lang.ref.WeakReference;
9192
import java.util.ArrayList;
9293
import java.util.Arrays;
@@ -748,7 +749,7 @@ public void onDestroy() {
748749
*/
749750
private Optional<AppCompatActivity> getActivityContext() {
750751
return Optional.ofNullable(weakContext)
751-
.flatMap(context -> Optional.ofNullable(context.get()))
752+
.map(Reference::get)
752753
.filter(context -> !context.isFinishing());
753754
}
754755

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@ public void onFullscreenStateChanged(final boolean fullscreen) {
18871887
setupBrightness();
18881888
if (!isPlayerAndPlayerServiceAvailable()
18891889
|| player.UIs().get(MainPlayerUi.class).isEmpty()
1890-
|| getRoot().flatMap(v -> Optional.ofNullable(v.getParent())).isEmpty()) {
1890+
|| getRoot().map(View::getParent).isEmpty()) {
18911891
return;
18921892
}
18931893

app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ default Optional<Quality> getMaybeQuality() {
6262
@NonNull
6363
static Optional<MediaItemTag> from(@Nullable final MediaItem mediaItem) {
6464
return Optional.ofNullable(mediaItem)
65-
.flatMap(item -> Optional.ofNullable(item.localConfiguration))
66-
.flatMap(localConfiguration -> Optional.ofNullable(localConfiguration.tag))
65+
.map(item -> item.localConfiguration)
66+
.map(localConfiguration -> localConfiguration.tag)
6767
.filter(MediaItemTag.class::isInstance)
6868
.map(MediaItemTag.class::cast);
6969
}

0 commit comments

Comments
 (0)