diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt b/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt index 26a795ab..cde9318e 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt @@ -79,13 +79,8 @@ class PlaybackSession( val progress get() = currentTime / getTotalDuration() @get:JsonIgnore - val isLocalLibraryItemOnly - get() = localLibraryItemId != "" && libraryItemId == null - @get:JsonIgnore val mediaItemId - get() = - if (isLocalLibraryItemOnly) localMediaProgressId - else if (episodeId.isNullOrEmpty()) libraryItemId ?: "" else "$libraryItemId-$episodeId" + get() = if (episodeId.isNullOrEmpty()) libraryItemId ?: "" else "$libraryItemId-$episodeId" @JsonIgnore fun getCurrentTrackIndex(): Int { diff --git a/android/app/src/main/java/com/audiobookshelf/app/media/MediaEventManager.kt b/android/app/src/main/java/com/audiobookshelf/app/media/MediaEventManager.kt index 04f54b42..82bf3f42 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/media/MediaEventManager.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/media/MediaEventManager.kt @@ -114,20 +114,14 @@ object MediaEventManager { private fun createMediaItemHistoryForSession(playbackSession: PlaybackSession): MediaItemHistory { Log.i(tag, "Creating new media item history for media \"${playbackSession.displayTitle}\"") - val isLocalOnly = playbackSession.isLocalLibraryItemOnly - val libraryItemId = - if (isLocalOnly) playbackSession.localLibraryItemId - else playbackSession.libraryItemId ?: "" - val episodeId: String? = - if (isLocalOnly && playbackSession.localEpisodeId != null) - playbackSession.localEpisodeId - else playbackSession.episodeId + val libraryItemId = playbackSession.libraryItemId ?: "" + val episodeId: String? = playbackSession.episodeId return MediaItemHistory( id = playbackSession.mediaItemId, mediaDisplayTitle = playbackSession.displayTitle ?: "Unset", libraryItemId, episodeId, - isLocalOnly, + false, // local-only items are not supported playbackSession.serverConnectionConfigId, playbackSession.serverAddress, playbackSession.userId, diff --git a/android/app/src/main/java/com/audiobookshelf/app/media/MediaProgressSyncer.kt b/android/app/src/main/java/com/audiobookshelf/app/media/MediaProgressSyncer.kt index ecca38d6..ae110498 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/media/MediaProgressSyncer.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/media/MediaProgressSyncer.kt @@ -248,11 +248,7 @@ class MediaProgressSyncer( // Save playback session to db (server linked sessions only) // Sessions are removed once successfully synced with the server - currentPlaybackSession?.let { - if (!it.isLocalLibraryItemOnly) { - DeviceManager.dbManager.savePlaybackSession(it) - } - } + currentPlaybackSession?.let { DeviceManager.dbManager.savePlaybackSession(it) } if (currentIsLocal) { // Save local progress sync diff --git a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt index 9e6fa3af..e9e792b7 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt @@ -784,7 +784,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { if (currentPlaybackSession == null) return true mediaProgressSyncer.currentPlaybackSession?.let { playbackSession -> - if (!DeviceManager.checkConnectivity(ctx) || playbackSession.isLocalLibraryItemOnly) { + if (!DeviceManager.checkConnectivity(ctx)) { return true // carry on }