Adds a check to make sure the NIP-96 uploader is a url before adding to the list.

Solves NPE on the model if they are not urls

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/MediaServerEditField.kt

@@ -23,11 +23,11 @@ package com.vitorpamplona.amethyst.ui.actions.mediaServers
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -40,6 +40,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.quartz.encoders.HttpUrlFormatter
 
 @Composable
 fun MediaServerEditField(
@@ -47,6 +48,12 @@ fun MediaServerEditField(
     onAddServer: (String) -> Unit,
 ) {
     var url by remember { mutableStateOf("") }
+    val validUrl by
+        remember {
+            derivedStateOf {
+                url.isNotBlank() && HttpUrlFormatter.isValidUrl(url)
+            }
+        }
 
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -73,20 +80,12 @@ fun MediaServerEditField(
         Button(
             onClick = {
                 if (url.isNotBlank() && url != "/") {
-                    onAddServer(url)
+                    onAddServer(HttpUrlFormatter.normalize(url))
                     url = ""
                 }
             },
             shape = ButtonBorder,
-            colors =
-                ButtonDefaults.buttonColors(
-                    containerColor =
-                        if (url.isNotBlank()) {
-                            MaterialTheme.colorScheme.primary
-                        } else {
-                            MaterialTheme.colorScheme.placeholderText
-                        },
-                ),
+            enabled = validUrl,
         ) {
             Text(text = stringRes(id = R.string.add), color = Color.White)
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/MediaServersViewModel.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.ui.actions.mediaServers
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
@@ -47,12 +48,17 @@ class MediaServersViewModel : ViewModel() {
         isModified = false
         _fileServers.update {
             val obtainedFileServers = obtainFileServers() ?: emptyList()
-            obtainedFileServers.map { serverUrl ->
-                Nip96MediaServers
-                    .ServerName(
-                        URIReference.parse(serverUrl).host.value,
-                        serverUrl,
-                    )
+            obtainedFileServers.mapNotNull { serverUrl ->
+                try {
+                    Nip96MediaServers
+                        .ServerName(
+                            URIReference.parse(serverUrl).host.value,
+                            serverUrl,
+                        )
+                } catch (e: Exception) {
+                    Log.d("MediaServersViewModel", "Invalid URL in NIP-96 server list")
+                    null
+                }
             }
         }
     }