mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-12-01 12:31:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
ByteHamster
2023-11-05 08:27:34 +01:00
parent 2c3fb5610a 8d4270ab87
commit f7a13065a9
42 changed files with 1511 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
model/src/main/java/de/danoeh/antennapod/model/MediaMetadataRetrieverCompat.java Normal file
View File

@ -0,0 +1,18 @@
package de.danoeh.antennapod.model;
import android.media.MediaMetadataRetriever;
import java.io.IOException;
/**
* On SDK<29, this class does not have a close method yet, so the app crashes when using try-with-resources.
*/
public class MediaMetadataRetrieverCompat extends MediaMetadataRetriever {
public void close() {
try {
release();
} catch (IOException e) {
e.printStackTrace();
}
}
}

7
model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
View File

@ -2,13 +2,13 @@ package de.danoeh.antennapod.model.feed;
import android.content.Context;
import android.content.SharedPreferences.Editor;
import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.Nullable;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaDescriptionCompat;
import de.danoeh.antennapod.model.MediaMetadataRetrieverCompat;
import de.danoeh.antennapod.model.playback.MediaType;
import de.danoeh.antennapod.model.playback.Playable;
import de.danoeh.antennapod.model.playback.RemoteMedia;
@ -458,11 +458,10 @@ public class FeedMedia extends FeedFile implements Playable {
hasEmbeddedPicture = Boolean.FALSE;
return;
}
MediaMetadataRetriever mmr = new MediaMetadataRetriever();
try {
try (MediaMetadataRetrieverCompat mmr = new MediaMetadataRetrieverCompat()) {
mmr.setDataSource(getLocalMediaUrl());
byte[] image = mmr.getEmbeddedPicture();
if(image != null) {
if (image != null) {
hasEmbeddedPicture = Boolean.TRUE;
} else {
hasEmbeddedPicture = Boolean.FALSE;