Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify loading media icon for MediaSession

This commit is contained in:
ByteHamster 2021-07-29 21:51:38 +02:00
parent bc59d50804
commit 0247a018a2
2 changed files with 38 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -13,7 +13,6 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.net.Uri; import android.net.Uri;
@ -41,10 +40,6 @@ import android.view.SurfaceHolder;
import android.webkit.URLUtil; import android.webkit.URLUtil;
import android.widget.Toast; import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.Target;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -63,7 +58,6 @@ import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.model.feed.FeedPreferences; import de.danoeh.antennapod.model.feed.FeedPreferences;
import de.danoeh.antennapod.model.playback.MediaType; import de.danoeh.antennapod.model.playback.MediaType;
import de.danoeh.antennapod.core.glide.ApGlideSettings;
import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences;
@ -72,7 +66,6 @@ import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.storage.DBTasks; import de.danoeh.antennapod.core.storage.DBTasks;
import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.DBWriter;
import de.danoeh.antennapod.core.storage.FeedSearcher; import de.danoeh.antennapod.core.storage.FeedSearcher;
import de.danoeh.antennapod.core.feed.util.ImageResourceUtils;
import de.danoeh.antennapod.core.sync.SyncService; import de.danoeh.antennapod.core.sync.SyncService;
import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.core.util.IntentUtils; import de.danoeh.antennapod.core.util.IntentUtils;
@ -1286,81 +1279,43 @@ public class PlaybackService extends MediaBrowserServiceCompat {
(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)); (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP));
} }
/**
* Used by updateMediaSessionMetadata to load notification data in another thread.
*/
private Thread mediaSessionSetupThread;
private void updateMediaSessionMetadata(final Playable p) { private void updateMediaSessionMetadata(final Playable p) {
if (p == null || mediaSession == null) { if (p == null || mediaSession == null) {
return; return;
} }
if (mediaSessionSetupThread != null) {
mediaSessionSetupThread.interrupt(); MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, p.getFeedTitle());
builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, p.getEpisodeTitle());
builder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, p.getFeedTitle());
builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, p.getDuration());
builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, p.getEpisodeTitle());
builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE, p.getFeedTitle());
if (UserPreferences.setLockscreenBackground() && notificationBuilder.isIconCached()) {
builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, notificationBuilder.getCachedIcon());
} else if (isCasting && !TextUtils.isEmpty(p.getImageLocation())) {
// In the absence of metadata art, the controller dialog takes care of creating it.
builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, p.getImageLocation());
} }
Runnable mediaSessionSetupTask = () -> { if (stateManager.hasReceivedValidStartCommand()) {
MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); mediaSession.setSessionActivity(PendingIntent.getActivity(this, R.id.pending_intent_player_activity,
builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, p.getFeedTitle()); PlaybackService.getPlayerActivityIntent(this), PendingIntent.FLAG_UPDATE_CURRENT));
builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, p.getEpisodeTitle()); try {
builder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, p.getFeedTitle()); mediaSession.setMetadata(builder.build());
builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, p.getDuration()); } catch (OutOfMemoryError e) {
builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, p.getEpisodeTitle()); Log.e(TAG, "Setting media session metadata", e);
builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE, p.getFeedTitle()); builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, null);
mediaSession.setMetadata(builder.build());
String imageLocation = p.getImageLocation();
if (!TextUtils.isEmpty(imageLocation)) {
if (UserPreferences.setLockscreenBackground()) {
Bitmap art;
builder.putString(MediaMetadataCompat.METADATA_KEY_ART_URI, imageLocation);
try {
art = Glide.with(this)
.asBitmap()
.load(imageLocation)
.apply(RequestOptions.diskCacheStrategyOf(ApGlideSettings.AP_DISK_CACHE_STRATEGY))
.submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
.get();
builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, art);
} catch (Throwable tr1) {
try {
art = Glide.with(this)
.asBitmap()
.load(ImageResourceUtils.getFallbackImageLocation(p))
.apply(RequestOptions.diskCacheStrategyOf(ApGlideSettings.AP_DISK_CACHE_STRATEGY))
.submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
.get();
builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, art);
} catch (Throwable tr2) {
Log.e(TAG, Log.getStackTraceString(tr2));
}
}
} else if (isCasting) {
// In the absence of metadata art, the controller dialog takes care of creating it.
builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, imageLocation);
}
} }
if (!Thread.currentThread().isInterrupted() && stateManager.hasReceivedValidStartCommand()) { }
mediaSession.setSessionActivity(PendingIntent.getActivity(this, R.id.pending_intent_player_activity,
PlaybackService.getPlayerActivityIntent(this), PendingIntent.FLAG_UPDATE_CURRENT));
try {
mediaSession.setMetadata(builder.build());
} catch (OutOfMemoryError e) {
Log.e(TAG, "Setting media session metadata", e);
builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, null);
mediaSession.setMetadata(builder.build());
}
}
};
mediaSessionSetupThread = new Thread(mediaSessionSetupTask);
mediaSessionSetupThread.start();
} }
/** /**
* Used by setupNotification to load notification data in another thread. * Used by setupNotification to load notification data in another thread.
*/ */
private Thread notificationSetupThread; private Thread playableIconLoaderThread;
/** /**
* Prepares notification and starts the service in the foreground. * Prepares notification and starts the service in the foreground.
@ -1371,8 +1326,8 @@ public class PlaybackService extends MediaBrowserServiceCompat {
private synchronized void setupNotification(final Playable playable) { private synchronized void setupNotification(final Playable playable) {
Log.d(TAG, "setupNotification"); Log.d(TAG, "setupNotification");
if (notificationSetupThread != null) { if (playableIconLoaderThread != null) {
notificationSetupThread.interrupt(); playableIconLoaderThread.interrupt();
} }
if (playable == null || mediaPlayer == null) { if (playable == null || mediaPlayer == null) {
Log.d(TAG, "setupNotification: playable=" + playable); Log.d(TAG, "setupNotification: playable=" + playable);
@ -1395,14 +1350,15 @@ public class PlaybackService extends MediaBrowserServiceCompat {
startForegroundIfPlaying(playerStatus); startForegroundIfPlaying(playerStatus);
if (!notificationBuilder.isIconCached()) { if (!notificationBuilder.isIconCached()) {
notificationSetupThread = new Thread(() -> { playableIconLoaderThread = new Thread(() -> {
Log.d(TAG, "Loading notification icon"); Log.d(TAG, "Loading notification icon");
notificationBuilder.loadIcon(); notificationBuilder.loadIcon();
if (!Thread.currentThread().isInterrupted()) { if (!Thread.currentThread().isInterrupted()) {
notificationManager.notify(R.id.notification_playing, notificationBuilder.build()); notificationManager.notify(R.id.notification_playing, notificationBuilder.build());
updateMediaSessionMetadata(playable);
} }
}); });
notificationSetupThread.start(); playableIconLoaderThread.start();
} }
} }

8
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java
View File

@ -89,14 +89,22 @@ public class PlaybackServiceNotificationBuilder {
.apply(new RequestOptions().centerCrop()) .apply(new RequestOptions().centerCrop())
.submit(iconSize, iconSize) .submit(iconSize, iconSize)
.get(); .get();
} catch (InterruptedException ignore) {
Log.e(TAG, "Media icon loader was interrupted");
} catch (Throwable tr) { } catch (Throwable tr) {
Log.e(TAG, "Error loading the media icon for the notification", tr); Log.e(TAG, "Error loading the media icon for the notification", tr);
} }
} catch (InterruptedException ignore) {
Log.e(TAG, "Media icon loader was interrupted");
} catch (Throwable tr) { } catch (Throwable tr) {
Log.e(TAG, "Error loading the media icon for the notification", tr); Log.e(TAG, "Error loading the media icon for the notification", tr);
} }
} }
public Bitmap getCachedIcon() {
return icon;
}
private Bitmap getDefaultIcon() { private Bitmap getDefaultIcon() {
if (defaultIcon == null) { if (defaultIcon == null) {
defaultIcon = getBitmap(context, R.mipmap.ic_launcher); defaultIcon = getBitmap(context, R.mipmap.ic_launcher);