Merge pull request #1462 from nichwall/andriod_deviceManager_cleanup

Andriod `DeviceManager.kt` cleanup

android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt

@@ -12,11 +12,19 @@ import com.audiobookshelf.app.managers.DbManager
 import com.audiobookshelf.app.player.PlayerNotificationService
 import com.audiobookshelf.app.updateAppWidget
 
+/** Interface for widget event handling. */
 interface WidgetEventEmitter {
+  /**
+   * Called when the player state changes.
+   * @param pns The PlayerNotificationService instance.
+   */
   fun onPlayerChanged(pns: PlayerNotificationService)
+
+  /** Called when the player is closed. */
   fun onPlayerClosed()
 }
 
+/** Singleton object for managing device-related operations. */
 object DeviceManager {
   const val tag = "DeviceManager"
 
@@ -24,62 +32,72 @@ object DeviceManager {
   var deviceData: DeviceData = dbManager.getDeviceData()
   var serverConnectionConfig: ServerConnectionConfig? = null
 
-  val serverConnectionConfigId get() = serverConnectionConfig?.id ?: ""
+  val serverConnectionConfigId
-  val serverAddress get() = serverConnectionConfig?.address ?: ""
+    get() = serverConnectionConfig?.id ?: ""
-  val serverUserId get() = serverConnectionConfig?.userId ?: ""
+  val serverAddress
-  val token get() = serverConnectionConfig?.token ?: ""
+    get() = serverConnectionConfig?.address ?: ""
-  val isConnectedToServer get() = serverConnectionConfig != null
+  val serverUserId
+    get() = serverConnectionConfig?.userId ?: ""
+  val token
+    get() = serverConnectionConfig?.token ?: ""
+  val isConnectedToServer
+    get() = serverConnectionConfig != null
 
   var widgetUpdater: WidgetEventEmitter? = null
 
   init {
     Log.d(tag, "Device Manager Singleton invoked")
 
-    // Initialize new sleep timer settings and shake sensitivity added in v0.9.61
+    // Default settings if they have not been set yet. Removes Elvis operator for null safety due to
-    if (deviceData.deviceSettings?.autoSleepTimerStartTime == null || deviceData.deviceSettings?.autoSleepTimerEndTime == null) {
+    // variables being non-nullable.
-      deviceData.deviceSettings?.autoSleepTimerStartTime = "22:00"
+    deviceData.deviceSettings?.apply {
-      deviceData.deviceSettings?.autoSleepTimerStartTime = "06:00"
+      // Sleep timer settings, added v0.9.61
-      deviceData.deviceSettings?.sleepTimerLength = 900000L
+      autoSleepTimerStartTime = "22:00"
-    }
+      autoSleepTimerEndTime = "06:00"
-    if (deviceData.deviceSettings?.shakeSensitivity == null) {
+      sleepTimerLength = 900000L
-      deviceData.deviceSettings?.shakeSensitivity = ShakeSensitivitySetting.MEDIUM
+      shakeSensitivity = ShakeSensitivitySetting.MEDIUM
-    }
+      // Auto sleep timer auto rewind, added v0.9.64
-    // Initialize auto sleep timer auto rewind added in v0.9.64
+      autoSleepTimerAutoRewindTime = 300000L // 5 minutes
-    if (deviceData.deviceSettings?.autoSleepTimerAutoRewindTime == null) {
+      // Langugage code, added v0.9.69
-      deviceData.deviceSettings?.autoSleepTimerAutoRewindTime = 300000L // 5 minutes
+      languageCode = "en-us"
-    }
+      // Download and streaming using cellular, added v0.9.75
-
+      downloadUsingCellular = DownloadUsingCellularSetting.ALWAYS
-    // Language added in v0.9.69
+      streamingUsingCellular = StreamingUsingCellularSetting.ALWAYS
-    if (deviceData.deviceSettings?.languageCode == null) {
+      // Android Auto settings, added v0.9.78
-      deviceData.deviceSettings?.languageCode = "en-us"
+      androidAutoBrowseLimitForGrouping = 100
-    }
+      androidAutoBrowseSeriesSequenceOrder = AndroidAutoBrowseSeriesSequenceOrderSetting.ASC
-
-    if (deviceData.deviceSettings?.downloadUsingCellular == null) {
-      deviceData.deviceSettings?.downloadUsingCellular = DownloadUsingCellularSetting.ALWAYS
-    }
-
-    if (deviceData.deviceSettings?.streamingUsingCellular == null) {
-      deviceData.deviceSettings?.streamingUsingCellular = StreamingUsingCellularSetting.ALWAYS
-    }
-    if (deviceData.deviceSettings?.androidAutoBrowseLimitForGrouping == null) {
-      deviceData.deviceSettings?.androidAutoBrowseLimitForGrouping = 100
-    }
-    if (deviceData.deviceSettings?.androidAutoBrowseSeriesSequenceOrder == null) {
-      deviceData.deviceSettings?.androidAutoBrowseSeriesSequenceOrder = AndroidAutoBrowseSeriesSequenceOrderSetting.ASC
     }
   }
 
+  /**
+   * Encodes the given ID to a Base64 string.
+   * @param id The ID to encode.
+   * @return The Base64 encoded string.
+   */
   fun getBase64Id(id: String): String {
-    return android.util.Base64.encodeToString(id.toByteArray(), android.util.Base64.URL_SAFE or android.util.Base64.NO_WRAP)
+    return android.util.Base64.encodeToString(
+            id.toByteArray(),
+            android.util.Base64.URL_SAFE or android.util.Base64.NO_WRAP
+    )
   }
 
+  /**
+   * Retrieves the server connection configuration for the given ID.
+   * @param id The ID of the server connection configuration.
+   * @return The ServerConnectionConfig instance or null if not found.
+   */
   fun getServerConnectionConfig(id: String?): ServerConnectionConfig? {
-    if (id == null) return null
+    return id?.let { deviceData.serverConnectionConfigs.find { it.id == id } }
-    return deviceData.serverConnectionConfigs.find { it.id == id }
   }
 
+  /**
+   * Checks the network connectivity status.
+   * @param ctx The context to use for checking connectivity.
+   * @return True if connected to the internet, false otherwise.
+   */
   fun checkConnectivity(ctx: Context): Boolean {
-    val connectivityManager = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val connectivityManager =
+            ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
     val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
     if (capabilities != null) {
       if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
@@ -96,16 +114,24 @@ object DeviceManager {
     return false
   }
 
+  /**
+   * Sets the last playback session.
+   * @param playbackSession The playback session to set.
+   */
   fun setLastPlaybackSession(playbackSession: PlaybackSession) {
     deviceData.lastPlaybackSession = playbackSession
     dbManager.saveDeviceData(deviceData)
   }
 
+  /**
+   * Initializes the widget updater.
+   * @param context The context to use for initializing the widget updater.
+   */
   fun initializeWidgetUpdater(context: Context) {
     Log.d(tag, "Initializing widget updater")
-    widgetUpdater = (object : WidgetEventEmitter {
+    widgetUpdater =
+            (object : WidgetEventEmitter {
               override fun onPlayerChanged(pns: PlayerNotificationService) {
-
                 val isPlaying = pns.currentPlayer.isPlaying
 
                 val appWidgetManager = AppWidgetManager.getInstance(context)
@@ -114,15 +140,30 @@ object DeviceManager {
                 val playbackSession = pns.getCurrentPlaybackSessionCopy()
 
                 for (widgetId in ids) {
-          updateAppWidget(context, appWidgetManager, widgetId, playbackSession, isPlaying, PlayerNotificationService.isClosed)
+                  updateAppWidget(
+                          context,
+                          appWidgetManager,
+                          widgetId,
+                          playbackSession,
+                          isPlaying,
+                          PlayerNotificationService.isClosed
+                  )
                 }
               }
+
               override fun onPlayerClosed() {
                 val appWidgetManager = AppWidgetManager.getInstance(context)
                 val componentName = ComponentName(context, MediaPlayerWidget::class.java)
                 val ids = appWidgetManager.getAppWidgetIds(componentName)
                 for (widgetId in ids) {
-          updateAppWidget(context, appWidgetManager, widgetId, deviceData.lastPlaybackSession, false, PlayerNotificationService.isClosed)
+                  updateAppWidget(
+                          context,
+                          appWidgetManager,
+                          widgetId,
+                          deviceData.lastPlaybackSession,
+                          false,
+                          PlayerNotificationService.isClosed
+                  )
                 }
               }
             })