diff --git a/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt b/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt index 57fca917..2ba28d05 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt @@ -34,6 +34,7 @@ object DeviceManager { val serverConnectionConfigId get() = serverConnectionConfig?.id ?: "" val serverConnectionConfigName get() = serverConnectionConfig?.name ?: "" + val serverConnectionConfigString get() = serverConnectionConfig?.name ?: "No server connection" val serverAddress get() = serverConnectionConfig?.address ?: "" val serverUserId diff --git a/android/app/src/main/java/com/audiobookshelf/app/media/MediaManager.kt b/android/app/src/main/java/com/audiobookshelf/app/media/MediaManager.kt index 59f22840..39b3c25f 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/media/MediaManager.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/media/MediaManager.kt @@ -136,7 +136,6 @@ class MediaManager(private var apiHandler: ApiHandler, var ctx: Context) { val serverConnConfig = if (DeviceManager.isConnectedToServer) DeviceManager.serverConnectionConfig else DeviceManager.deviceData.getLastServerConnectionConfig() if (!DeviceManager.isConnectedToServer || !DeviceManager.checkConnectivity(ctx) || serverConnConfig == null || serverConnConfig.id !== serverConfigIdUsed) { - Log.d(tag, "Reset caches") podcastEpisodeLibraryItemMap = mutableMapOf() serverLibraries = listOf() serverLibraryItems = mutableListOf() 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 6cfc9cc1..cea23bd9 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 @@ -2,6 +2,7 @@ package com.audiobookshelf.app.player import android.annotation.SuppressLint import android.app.* +import android.bluetooth.BluetoothClass.Device import android.content.Context import android.content.Intent import android.graphics.Bitmap @@ -1106,11 +1107,12 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { // No further calls will be made to other media browsing methods. null } else { - Log.d(tag, "Android Auto starting $clientPackageName $clientUid") + AbsLogger.info(tag, "onGetRoot: clientPackageName: $clientPackageName, clientUid: $clientUid") isStarted = true // Reset cache if no longer connected to server or server changed if (mediaManager.checkResetServerItems()) { + AbsLogger.info(tag, "onGetRoot: Reset Android Auto server items cache (${DeviceManager.serverConnectionConfigString})") forceReloadingAndroidAuto = true } @@ -1135,7 +1137,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { parentMediaId: String, result: Result> ) { - Log.d(tag, "ON LOAD CHILDREN $parentMediaId") + AbsLogger.info(tag, "onLoadChildren: parentMediaId: $parentMediaId (${DeviceManager.serverConnectionConfigString})") result.detach() @@ -1146,7 +1148,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { } if (parentMediaId == DOWNLOADS_ROOT) { // Load downloads - val localBooks = DeviceManager.dbManager.getLocalLibraryItems("book") val localPodcasts = DeviceManager.dbManager.getLocalLibraryItems("podcast") val localBrowseItems: MutableList = mutableListOf() @@ -1243,8 +1244,10 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { Log.d(tag, "Trying to initialize browseTree.") if (!this::browseTree.isInitialized || forceReloadingAndroidAuto) { forceReloadingAndroidAuto = false + AbsLogger.info(tag, "onLoadChildren: Loading Android Auto items") mediaManager.loadAndroidAutoItems { - Log.d(tag, "android auto loaded. Starting browseTree initialize") + AbsLogger.info(tag, "onLoadChildren: Loaded Android Auto data, initializing browseTree") + browseTree = BrowseTree( this, @@ -1260,15 +1263,21 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { MediaBrowserCompat.MediaItem.FLAG_BROWSABLE ) } - Log.d(tag, "browseTree initialize and android auto loaded") + result.sendResult(children as MutableList?) firstLoadDone = true if (mediaManager.serverLibraries.isNotEmpty()) { - Log.d(tag, "Starting personalization fetch") - mediaManager.populatePersonalizedDataForAllLibraries { notifyChildrenChanged("/") } + AbsLogger.info(tag, "onLoadChildren: Android Auto fetching personalized data for all libraries") + mediaManager.populatePersonalizedDataForAllLibraries { + AbsLogger.info(tag, "onLoadChildren: Android Auto loaded personalized data for all libraries") + notifyChildrenChanged("/") + } - Log.d(tag, "Initialize inprogress items") - mediaManager.initializeInProgressItems { notifyChildrenChanged("/") } + AbsLogger.info(tag, "onLoadChildren: Android Auto fetching in progress items") + mediaManager.initializeInProgressItems { + AbsLogger.info(tag, "onLoadChildren: Android Auto loaded in progress items") + notifyChildrenChanged("/") + } } } } else { @@ -1288,7 +1297,8 @@ class PlayerNotificationService : MediaBrowserServiceCompat() { MediaBrowserCompat.MediaItem.FLAG_BROWSABLE ) } - Log.d(tag, "browseTree initialize and android auto loaded") + + AbsLogger.info(tag, "onLoadChildren: Android auto data loaded") result.sendResult(children as MutableList?) } } else if (parentMediaId == LIBRARIES_ROOT || parentMediaId == RECENTLY_ROOT) {