From db4f8b83d327f65cb451ffe6ae9e6bb23b6d9f7b Mon Sep 17 00:00:00 2001 From: Nite Date: Fri, 25 Sep 2020 10:43:33 +0200 Subject: [PATCH] Updated missing index handling --- .../org/moire/ultrasonic/activity/ServerRowAdapter.kt | 6 ++++-- .../org/moire/ultrasonic/data/ActiveServerProvider.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt index 3fc21977..fcddc267 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerRowAdapter.kt @@ -85,8 +85,10 @@ internal class ServerRowAdapter( text?.text = context.getString(R.string.main_offline) description?.text = "" } else { - text?.text = data.singleOrNull { setting -> setting.index == index }?.name ?: "" - description?.text = data.singleOrNull { setting -> setting.index == index }?.url ?: "" + val setting = data.singleOrNull { t -> t.index == index } + text?.text = setting?.name ?: "" + description?.text = setting?.url ?: "" + if (setting == null) serverMenu?.visibility = View.INVISIBLE } // Provide icons for the row 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 feb1fa19..b3f044e6 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt @@ -75,7 +75,7 @@ class ActiveServerProvider( } GlobalScope.launch(Dispatchers.IO) { - val serverId = repository.findByIndex(index)!!.id + val serverId = repository.findByIndex(index)?.id ?: 0 setActiveServerId(context, serverId) } }