Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify code and add annotations

This commit is contained in:
TobiGr 2021-10-10 20:30:56 +02:00
parent 4e8519a1b9
commit 658d988254
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
View File

@ -334,9 +334,9 @@ public class HistoryRecordManager {
.getState(entities.get(0).getUid()).blockingFirst(); .getState(entities.get(0).getUid()).blockingFirst();
if (states.isEmpty()) { if (states.isEmpty()) {
result.add(null); result.add(null);
continue; } else {
result.add(states.get(0));
} }
result.add(states.get(0));
} }
return result; return result;
}).subscribeOn(Schedulers.io()); }).subscribeOn(Schedulers.io());
@ -362,9 +362,9 @@ public class HistoryRecordManager {
.blockingFirst(); .blockingFirst();
if (states.isEmpty()) { if (states.isEmpty()) {
result.add(null); result.add(null);
continue; } else {
result.add(states.get(0));
} }
result.add(states.get(0));
} }
return result; return result;
}).subscribeOn(Schedulers.io()); }).subscribeOn(Schedulers.io());

7
app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
View File

@ -179,9 +179,7 @@ public class MediaSessionManager {
// If we got an album art check if the current set AlbumArt is null // If we got an album art check if the current set AlbumArt is null
if (optAlbumArt.isPresent() && getMetadataAlbumArt() == null) { if (optAlbumArt.isPresent() && getMetadataAlbumArt() == null) {
if (DEBUG) { if (DEBUG) {
if (getMetadataAlbumArt() == null) { Log.d(TAG, "N_getMetadataAlbumArt: thumb == null");
Log.d(TAG, "N_getMetadataAlbumArt: thumb == null");
}
} }
return true; return true;
} }
@ -191,16 +189,19 @@ public class MediaSessionManager {
} }
@Nullable
private Bitmap getMetadataAlbumArt() { private Bitmap getMetadataAlbumArt() {
return mediaSession.getController().getMetadata() return mediaSession.getController().getMetadata()
.getBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART); .getBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART);
} }
@Nullable
private String getMetadataTitle() { private String getMetadataTitle() {
return mediaSession.getController().getMetadata() return mediaSession.getController().getMetadata()
.getString(MediaMetadataCompat.METADATA_KEY_TITLE); .getString(MediaMetadataCompat.METADATA_KEY_TITLE);
} }
@Nullable
private String getMetadataArtist() { private String getMetadataArtist() {
return mediaSession.getController().getMetadata() return mediaSession.getController().getMetadata()
.getString(MediaMetadataCompat.METADATA_KEY_ARTIST); .getString(MediaMetadataCompat.METADATA_KEY_ARTIST);