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

Updated missing index handling

This commit is contained in:
Nite 2020-09-25 10:43:33 +02:00
parent 02716c827a
commit db4f8b83d3
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt
View File

@ -85,8 +85,10 @@ internal class ServerRowAdapter(
text?.text = context.getString(R.string.main_offline) text?.text = context.getString(R.string.main_offline)
description?.text = "" description?.text = ""
} else { } else {
text?.text = data.singleOrNull { setting -> setting.index == index }?.name ?: "" val setting = data.singleOrNull { t -> t.index == index }
description?.text = data.singleOrNull { setting -> setting.index == index }?.url ?: "" text?.text = setting?.name ?: ""
description?.text = setting?.url ?: ""
if (setting == null) serverMenu?.visibility = View.INVISIBLE
} }
// Provide icons for the row // Provide icons for the row

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

@ -75,7 +75,7 @@ class ActiveServerProvider(
} }
GlobalScope.launch(Dispatchers.IO) { GlobalScope.launch(Dispatchers.IO) {
val serverId = repository.findByIndex(index)!!.id val serverId = repository.findByIndex(index)?.id ?: 0
setActiveServerId(context, serverId) setActiveServerId(context, serverId)
} }
} }