Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Index fix, added logging

This commit is contained in:
Nite 2020-09-22 21:50:53 +02:00
parent bed29ce33b
commit 06109424ec
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxMediaPlayer.java
View File

@ -98,6 +98,7 @@ public class JukeboxMediaPlayer
running.set(true); running.set(true);
startProcessTasks(); startProcessTasks();
Log.d(TAG, "Started Jukebox Service");
} }
public void stopJukeboxService() public void stopJukeboxService()
@ -109,6 +110,7 @@ public class JukeboxMediaPlayer
{ {
serviceThread.interrupt(); serviceThread.interrupt();
} }
Log.d(TAG, "Stopped Jukebox Service");
} }
private void startProcessTasks() private void startProcessTasks()
@ -320,6 +322,7 @@ public class JukeboxMediaPlayer
public void setEnabled(boolean enabled) public void setEnabled(boolean enabled)
{ {
Log.d(TAG, String.format("Jukebox Service setting enabled to %b", enabled));
this.enabled = enabled; this.enabled = enabled;
tasks.clear(); tasks.clear();

25
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSettingsModel.kt
View File

@ -58,7 +58,7 @@ class ServerSettingsModel(
if (serverNum != 0) { if (serverNum != 0) {
var index = 1 var index = 1
for (x in 1 until serverNum + 1) { for (x in 1 until serverNum + 1) {
val newServerSetting = loadServerSettingFromPreferences(index, settings) val newServerSetting = loadServerSettingFromPreferences(x, index, settings)
if (newServerSetting != null) { if (newServerSetting != null) {
dbServerList.add(newServerSetting) dbServerList.add(newServerSetting)
repository.insert(newServerSetting) repository.insert(newServerSetting)
@ -206,25 +206,26 @@ class ServerSettingsModel(
* Reads up a Server Setting stored in the obsolete Preferences * Reads up a Server Setting stored in the obsolete Preferences
*/ */
private fun loadServerSettingFromPreferences( private fun loadServerSettingFromPreferences(
id: Int, preferenceId: Int,
serverId: Int,
settings: SharedPreferences settings: SharedPreferences
): ServerSetting? { ): ServerSetting? {
val url = settings.getString(PREFERENCES_KEY_SERVER_URL + id, "") val url = settings.getString(PREFERENCES_KEY_SERVER_URL + preferenceId, "")
val userName = settings.getString(PREFERENCES_KEY_USERNAME + id, "") val userName = settings.getString(PREFERENCES_KEY_USERNAME + preferenceId, "")
if (url.isNullOrEmpty() || userName.isNullOrEmpty()) return null if (url.isNullOrEmpty() || userName.isNullOrEmpty()) return null
return ServerSetting( return ServerSetting(
id, serverId,
id, serverId,
settings.getString(PREFERENCES_KEY_SERVER_NAME + id, "")!!, settings.getString(PREFERENCES_KEY_SERVER_NAME + preferenceId, "")!!,
url, url,
userName, userName,
settings.getString(PREFERENCES_KEY_PASSWORD + id, "")!!, settings.getString(PREFERENCES_KEY_PASSWORD + preferenceId, "")!!,
settings.getBoolean(PREFERENCES_KEY_JUKEBOX_BY_DEFAULT + id, false), settings.getBoolean(PREFERENCES_KEY_JUKEBOX_BY_DEFAULT + preferenceId, false),
settings.getBoolean(PREFERENCES_KEY_ALLOW_SELF_SIGNED_CERTIFICATE + id, false), settings.getBoolean(PREFERENCES_KEY_ALLOW_SELF_SIGNED_CERTIFICATE + preferenceId, false),
settings.getBoolean(PREFERENCES_KEY_LDAP_SUPPORT + id, false), settings.getBoolean(PREFERENCES_KEY_LDAP_SUPPORT + preferenceId, false),
settings.getString(PREFERENCES_KEY_MUSIC_FOLDER_ID + id, "")!! settings.getString(PREFERENCES_KEY_MUSIC_FOLDER_ID + preferenceId, null)
) )
} }
} }

3
ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt
View File

@ -34,10 +34,11 @@ class ActiveServerProvider(
// Ideally this is the only call where we block the thread while using the repository // Ideally this is the only call where we block the thread while using the repository
runBlocking { runBlocking {
Log.d(TAG, "getActiveServer retrieving from DataBase, id: $serverId")
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
cachedServer = repository.findById(serverId) cachedServer = repository.findById(serverId)
} }
Log.d(TAG, "getActiveServer retrieved from DataBase, id: $serverId; " +
"cachedServer: $cachedServer")
} }
if (cachedServer != null) return cachedServer!! if (cachedServer != null) return cachedServer!!