Fix crashing when provided invalid custom server address

LibrePass · May 25, 2024 · bd6a44d · bd6a44d
1 parent 6c68b1d
commit bd6a44d
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/AddCustomServer.kt b/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/AddCustomServer.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.google.gson.JsonSyntaxException
 import dev.medzik.android.components.LoadingButton
 import dev.medzik.android.components.rememberMutableBoolean
 import dev.medzik.android.components.rememberMutableString
@@ -35,7 +36,16 @@ fun AddCustomServerScreen(navController: NavController) {
         loading = true
 
         runOnIOThread {
-            if (!checkApiConnection(server)) {
+            // TODO: Delete try when released new version of LibrePass client library
+            try {
+                if (!checkApiConnection(server)) {
+                    context.showToast(R.string.Tost_NoServerConnection)
+
+                    loading = false
+
+                    return@runOnIOThread
+                }
+            } catch (e: JsonSyntaxException) {
                 context.showToast(R.string.Tost_NoServerConnection)
 
                 loading = false