Fix displayed information for KServer connector

d4rken-org · Sep 5, 2024 · 9d0a721 · 9d0a721
1 parent 0746fe3
commit 9d0a721
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/src/main/java/eu/darken/octi/syncs/kserver/ui/KServerStateVH.kt b/app/src/main/java/eu/darken/octi/syncs/kserver/ui/KServerStateVH.kt
@@ -23,7 +23,7 @@ class KServerStateVH(parent: ViewGroup) :
     ) -> Unit = { item, _ ->
         title.text = when {
             item.credentials.serverAdress.domain.endsWith(".darken.eu") -> {
-                "${getString(R.string.sync_kserver_type_label)} (${item.credentials.serverAdress})"
+                "${getString(R.string.sync_kserver_type_label)} (${item.credentials.serverAdress.domain})"
             }
 
             else -> {

diff --git a/syncs-kserver/src/main/java/eu/darken/octi/syncs/kserver/core/KServerConnector.kt b/syncs-kserver/src/main/java/eu/darken/octi/syncs/kserver/core/KServerConnector.kt
@@ -269,6 +269,8 @@ class KServerConnector @AssistedInject constructor(
 
             serverLock.withLock {
                 withContext(NonCancellable) { block() }
+            }.also {
+                _state.updateBlocking { copy(lastError = null) }
             }
         } catch (e: Exception) {
             log(TAG, ERROR) { "runServerAction($tag) failed: ${e.asLog()}" }