Skip to content

Simplify code and add annotations #7220

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

Merged
TobiGr merged 1 commit into from
Oct 11, 2021
Merged

Simplify code and add annotations #7220

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@ public Single<List<StreamStateEntity>> loadStreamStateBatch(final List<InfoItem>
.getState(entities.get(0).getUid()).blockingFirst();
if (states.isEmpty()) {
result.add(null);
continue;
} else {
result.add(states.get(0));
}
result.add(states.get(0));
}
return result;
}).subscribeOn(Schedulers.io());
Expand All @@ -362,9 +362,9 @@ public Single<List<StreamStateEntity>> loadLocalStreamStateBatch(
.blockingFirst();
if (states.isEmpty()) {
result.add(null);
continue;
} else {
result.add(states.get(0));
}
result.add(states.get(0));
}
return result;
}).subscribeOn(Schedulers.io());
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,7 @@ private boolean checkIfMetadataShouldBeSet(
// If we got an album art check if the current set AlbumArt is null
if (optAlbumArt.isPresent() && getMetadataAlbumArt() == null) {
if (DEBUG) {
if (getMetadataAlbumArt() == null) {
Log.d(TAG, "N_getMetadataAlbumArt: thumb == null");
}
Log.d(TAG, "N_getMetadataAlbumArt: thumb == null");
}
return true;
}
Expand All @@ -191,16 +189,19 @@ private boolean checkIfMetadataShouldBeSet(
}


@Nullable
private Bitmap getMetadataAlbumArt() {
return mediaSession.getController().getMetadata()
.getBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART);
}

@Nullable
private String getMetadataTitle() {
return mediaSession.getController().getMetadata()
.getString(MediaMetadataCompat.METADATA_KEY_TITLE);
}

@Nullable
private String getMetadataArtist() {
return mediaSession.getController().getMetadata()
.getString(MediaMetadataCompat.METADATA_KEY_ARTIST);
Expand Down