sudoxreboot/audiobookshelf-atv
1
0
Fork 0
mirror of https://github.com/sudoxnym/audiobookshelf-atv.git synced 2026-07-14 07:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update:Android auto reset saved data if server config id changes

Browse source
This commit is contained in:
advplyr 2022-06-04 17:12:10 -05:00
parent 15d68ca285
commit aa65bb10c1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/app/src/main/java/com/audiobookshelf/app/media/MediaManager.kt
View file

@ -21,6 +21,7 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
var serverPodcastEpisodes = listOf<PodcastEpisode>()
var serverLibraryCategories = listOf<LibraryCategory>()
var serverLibraries = listOf<Library>()
var serverConfigIdUsed:String? = null
fun initializeAndroidAuto() {
Log.d(tag, "Android Auto started when MainActivity was never started - initializing Paper")
@ -34,7 +35,9 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
fun checkResetServerItems() {
// When opening android auto need to check if still connected to server
// and reset any server data already set
if (!DeviceManager.isConnectedToServer) {
val serverConnConfig = if (DeviceManager.isConnectedToServer) DeviceManager.serverConnectionConfig else DeviceManager.deviceData.getLastServerConnectionConfig()
if (!DeviceManager.isConnectedToServer || !apiHandler.isOnline() || serverConnConfig == null || serverConnConfig.id !== serverConfigIdUsed) {
serverPodcastEpisodes = listOf()
serverLibraryCategories = listOf()
serverLibraries = listOf()
@ -162,6 +165,8 @@ class MediaManager(var apiHandler: ApiHandler, var ctx: Context) {
Log.d(tag, "Not connected to server, set last server \"${DeviceManager.serverAddress}\"")
}
serverConfigIdUsed = DeviceManager.serverConnectionConfigId
loadLibraries { libraries ->
val library = libraries[0]
Log.d(tag, "Loading categories for library ${library.name} - ${library.id} - ${library.mediaType}")

4
android/app/src/main/java/com/audiobookshelf/app/player/MediaSessionCallback.kt
View file

@ -97,6 +97,10 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
podcastEpisode = libraryItemWithEpisode?.episode
} else {
libraryItemWrapper = playerNotificationService.mediaManager.getById(mediaId)
if (libraryItemWrapper == null) {
Log.e(tag, "onPlayFromMediaId: Media item not found $mediaId")
}
}
libraryItemWrapper?.let { li ->