Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support media resumption (#6350)

Browse Source 
This fixes the disappearing media notification after pressing the play button.
This commit is contained in:
ByteHamster 2023-02-25 16:33:11 +01:00 committed by GitHub
parent 2833812238
commit 9cd59a6720
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,9 +316,14 @@ public class PlaybackService extends MediaBrowserServiceCompat {
public BrowserRoot onGetRoot(@NonNull String clientPackageName, int clientUid, Bundle rootHints) { public BrowserRoot onGetRoot(@NonNull String clientPackageName, int clientUid, Bundle rootHints) {
Log.d(TAG, "OnGetRoot: clientPackageName=" + clientPackageName + Log.d(TAG, "OnGetRoot: clientPackageName=" + clientPackageName +
"; clientUid=" + clientUid + " ; rootHints=" + rootHints); "; clientUid=" + clientUid + " ; rootHints=" + rootHints);
return new BrowserRoot( if (rootHints != null && rootHints.getBoolean(BrowserRoot.EXTRA_RECENT)) {
getResources().getString(R.string.app_name), // Name visible in Android Auto Bundle extras = new Bundle();
null); // Bundle of optional extras extras.putBoolean(BrowserRoot.EXTRA_RECENT, true);
return new BrowserRoot(getResources().getString(R.string.recently_played_episodes), extras);
}
// Name visible in Android Auto
return new BrowserRoot(getResources().getString(R.string.app_name), null);
} }
private void loadQueueForMediaSession() { private void loadQueueForMediaSession() {
@ -392,8 +397,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
}); });
} }
private List<MediaBrowserCompat.MediaItem> loadChildrenSynchronous(@NonNull String parentId) private List<MediaBrowserCompat.MediaItem> loadChildrenSynchronous(@NonNull String parentId) {
throws InterruptedException {
List<MediaBrowserCompat.MediaItem> mediaItems = new ArrayList<>(); List<MediaBrowserCompat.MediaItem> mediaItems = new ArrayList<>();
if (parentId.equals(getResources().getString(R.string.app_name))) { if (parentId.equals(getResources().getString(R.string.app_name))) {
mediaItems.add(createBrowsableMediaItem(R.string.queue_label, R.drawable.ic_playlist_play_black, mediaItems.add(createBrowsableMediaItem(R.string.queue_label, R.drawable.ic_playlist_play_black,
@ -421,6 +425,13 @@ public class PlaybackService extends MediaBrowserServiceCompat {
} else if (parentId.startsWith("FeedId:")) { } else if (parentId.startsWith("FeedId:")) {
long feedId = Long.parseLong(parentId.split(":")[1]); long feedId = Long.parseLong(parentId.split(":")[1]);
feedItems = DBReader.getFeedItemList(DBReader.getFeed(feedId)); feedItems = DBReader.getFeedItemList(DBReader.getFeed(feedId));
} else if (parentId.equals(getString(R.string.recently_played_episodes))) {
Playable playable = PlaybackPreferences.createInstanceFromPreferences(this);
if (playable instanceof FeedMedia) {
feedItems = Collections.singletonList(((FeedMedia) playable).getItem());
} else {
return null;
}
} else { } else {
Log.e(TAG, "Parent ID not found: " + parentId); Log.e(TAG, "Parent ID not found: " + parentId);
return null; return null;

1
ui/i18n/src/main/res/values/strings.xml
View File

@ -26,6 +26,7 @@
<string name="episode_cache_full_message">The episode cache limit has been reached. You can increase the cache size in the Settings.</string> <string name="episode_cache_full_message">The episode cache limit has been reached. You can increase the cache size in the Settings.</string>
<string name="years_statistics_label">Years</string> <string name="years_statistics_label">Years</string>
<string name="notification_pref_fragment">Notifications</string> <string name="notification_pref_fragment">Notifications</string>
<string name="recently_played_episodes">Recently played episodes</string>
<!-- Google Assistant --> <!-- Google Assistant -->
<string name="app_action_not_found">\"%1$s\" not found</string> <string name="app_action_not_found">\"%1$s\" not found</string>