demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 17:11:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

MusicManager: Fix NPE when music not playing

Browse Source
This commit is contained in:
José Rebelo 2024-01-28 20:26:31 +00:00
parent a53d59f907
commit b0ff9eae88
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
View File

@ -24,6 +24,8 @@ import android.media.session.MediaController;
import android.media.session.MediaSessionManager; import android.media.session.MediaSessionManager;
import android.media.session.PlaybackState; import android.media.session.PlaybackState;
import androidx.annotation.Nullable;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -105,7 +107,12 @@ public class MediaManager {
} }
} }
@Nullable
public static MusicSpec extractMusicSpec(final MediaMetadata d) { public static MusicSpec extractMusicSpec(final MediaMetadata d) {
if (d == null) {
return null;
}
final MusicSpec musicSpec = new MusicSpec(); final MusicSpec musicSpec = new MusicSpec();
try { try {
@ -128,7 +135,12 @@ public class MediaManager {
return musicSpec; return musicSpec;
} }
@Nullable
public static MusicStateSpec extractMusicStateSpec(final PlaybackState s) { public static MusicStateSpec extractMusicStateSpec(final PlaybackState s) {
if (s == null) {
return null;
}
final MusicStateSpec stateSpec = new MusicStateSpec(); final MusicStateSpec stateSpec = new MusicStateSpec();
try { try {