From 06109424ec710a480665357dc7a9d4dfd5208948 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Tue, 22 Sep 2020 21:50:53 +0200
Subject: [PATCH] Index fix, added logging

---
 .../service/JukeboxMediaPlayer.java           |  3 +++
 .../activity/ServerSettingsModel.kt           | 25 ++++++++++---------
 .../ultrasonic/data/ActiveServerProvider.kt   |  3 ++-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxMediaPlayer.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxMediaPlayer.java
index 132ab3cd..411e836e 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxMediaPlayer.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxMediaPlayer.java
@@ -98,6 +98,7 @@ public class JukeboxMediaPlayer
 
 		running.set(true);
 		startProcessTasks();
+		Log.d(TAG, "Started Jukebox Service");
 	}
 
 	public void stopJukeboxService()
@@ -109,6 +110,7 @@ public class JukeboxMediaPlayer
 		{
 			serviceThread.interrupt();
 		}
+		Log.d(TAG, "Stopped Jukebox Service");
 	}
 
 	private void startProcessTasks()
@@ -320,6 +322,7 @@ public class JukeboxMediaPlayer
 
 	public void setEnabled(boolean enabled)
 	{
+		Log.d(TAG, String.format("Jukebox Service setting enabled to %b", enabled));
 		this.enabled = enabled;
 
 		tasks.clear();
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSettingsModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSettingsModel.kt
index 2f8e3500..97330e30 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSettingsModel.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSettingsModel.kt
@@ -58,7 +58,7 @@ class ServerSettingsModel(
                 if (serverNum != 0) {
                     var index = 1
                     for (x in 1 until serverNum + 1) {
-                        val newServerSetting = loadServerSettingFromPreferences(index, settings)
+                        val newServerSetting = loadServerSettingFromPreferences(x, index, settings)
                         if (newServerSetting != null) {
                             dbServerList.add(newServerSetting)
                             repository.insert(newServerSetting)
@@ -206,25 +206,26 @@ class ServerSettingsModel(
      * Reads up a Server Setting stored in the obsolete Preferences
      */
     private fun loadServerSettingFromPreferences(
-        id: Int,
+        preferenceId: Int,
+        serverId: Int,
         settings: SharedPreferences
     ): ServerSetting? {
-        val url = settings.getString(PREFERENCES_KEY_SERVER_URL + id, "")
-        val userName = settings.getString(PREFERENCES_KEY_USERNAME + id, "")
+        val url = settings.getString(PREFERENCES_KEY_SERVER_URL + preferenceId, "")
+        val userName = settings.getString(PREFERENCES_KEY_USERNAME + preferenceId, "")
 
         if (url.isNullOrEmpty() || userName.isNullOrEmpty()) return null
 
         return ServerSetting(
-            id,
-            id,
-            settings.getString(PREFERENCES_KEY_SERVER_NAME + id, "")!!,
+            serverId,
+            serverId,
+            settings.getString(PREFERENCES_KEY_SERVER_NAME + preferenceId, "")!!,
             url,
             userName,
-            settings.getString(PREFERENCES_KEY_PASSWORD + id, "")!!,
-            settings.getBoolean(PREFERENCES_KEY_JUKEBOX_BY_DEFAULT + id, false),
-            settings.getBoolean(PREFERENCES_KEY_ALLOW_SELF_SIGNED_CERTIFICATE + id, false),
-            settings.getBoolean(PREFERENCES_KEY_LDAP_SUPPORT + id, false),
-            settings.getString(PREFERENCES_KEY_MUSIC_FOLDER_ID + id, "")!!
+            settings.getString(PREFERENCES_KEY_PASSWORD + preferenceId, "")!!,
+            settings.getBoolean(PREFERENCES_KEY_JUKEBOX_BY_DEFAULT + preferenceId, false),
+            settings.getBoolean(PREFERENCES_KEY_ALLOW_SELF_SIGNED_CERTIFICATE + preferenceId, false),
+            settings.getBoolean(PREFERENCES_KEY_LDAP_SUPPORT + preferenceId, false),
+            settings.getString(PREFERENCES_KEY_MUSIC_FOLDER_ID + preferenceId, null)
         )
     }
 }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt
index f6d1882c..3cecf16b 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt
@@ -34,10 +34,11 @@ class ActiveServerProvider(
 
             // Ideally this is the only call where we block the thread while using the repository
             runBlocking {
-                Log.d(TAG, "getActiveServer retrieving from DataBase, id: $serverId")
                 withContext(Dispatchers.IO) {
                     cachedServer = repository.findById(serverId)
                 }
+                Log.d(TAG, "getActiveServer retrieved from DataBase, id: $serverId; " +
+                    "cachedServer: $cachedServer")
             }
 
             if (cachedServer != null) return cachedServer!!