Improves upload of music and documents.

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipB7Blossom/BlossomServerListState.kt

@@ -79,7 +79,7 @@ class BlossomServerListState(
                 emptyList(),
             )
 
-    fun mergeServerList(blossom: List<String>?): List<ServerName> = blossom?.map { ServerName(host(it), it, ServerType.Blossom) } ?: emptyList()
+    fun mergeServerList(blossom: List<String>?): List<ServerName> = blossom?.map { ServerName(host(it), it, ServerType.Blossom) }?.ifEmpty { DEFAULT_MEDIA_SERVERS } ?: DEFAULT_MEDIA_SERVERS
 
     val hostNameFlow: StateFlow<List<ServerName>> =
         flow

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MultiOrchestrator.kt

@@ -49,6 +49,8 @@ class MultiOrchestrator(
 
     fun hasVideo() = list.any { it.media.mimeType?.startsWith("video", ignoreCase = true) == true }
 
+    fun hasNonMedia() = list.any { it.media.isNotMedia() }
+
     suspend fun upload(
         alt: String?,
         contentWarningReason: String?,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt

@@ -54,6 +54,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
 import com.vitorpamplona.amethyst.ui.actions.uploads.ShowImageUploadGallery
 import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
@@ -204,7 +205,8 @@ fun ImageVideoPost(
                 fileServers
                     .firstOrNull { it == accountViewModel.account.settings.defaultFileServer }
                     ?.name
-                    ?: fileServers[0].name,
+                    ?: fileServers.firstOrNull()?.name
+                    ?: DEFAULT_MEDIA_SERVERS[0].name,
             options = fileServerOptions,
             onSelect = { postViewModel.selectedServer = fileServers[it] },
         )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/SelectFromGallery.kt

@@ -58,6 +58,11 @@ class SelectedMedia(
 
     fun isAudio() = mimeType?.startsWith("audio")
 
+    fun isNotMedia() =
+        mimeType?.let {
+            !(it.startsWith("image") || it.startsWith("video") || it.startsWith("audio"))
+        } ?: true
+
     fun isDocument() = mimeType == "application/pdf"
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/ShowImageUploadItem.kt

@@ -129,7 +129,7 @@ fun ShowImageGallery(
             icon = Icons.Default.AudioFile,
             label = media.mimeType ?: "audio/*",
         )
-    } else if (media.isDocument() == true) {
+    } else if (media.isDocument()) {
         FilePreviewPlaceholder(
             icon = Icons.Default.PictureAsPdf,
             label = media.mimeType ?: "application/pdf",
@@ -236,6 +236,10 @@ fun UploadingState(
     progress: Double,
     progressState: UploadingState,
 ) {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier.fillMaxSize(),
+    ) {
         Box(Modifier.size(55.dp), contentAlignment = Alignment.Center) {
             val animatedProgress by animateFloatAsState(
                 targetValue = progress.toFloat(),
@@ -270,6 +274,7 @@ fun UploadingState(
                 textAlign = TextAlign.Center,
             )
         }
+    }
 }
 
 @Composable
@@ -280,7 +285,7 @@ fun FilePreviewPlaceholder(
     Box(
         modifier =
             Modifier
-                .fillMaxWidth()
+                .fillMaxSize()
                 .background(MaterialTheme.colorScheme.surfaceVariant),
         contentAlignment = Alignment.Center,
     ) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/uploads/ImageVideoDescription.kt

@@ -57,6 +57,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.uploads.MultiOrchestrator
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
 import com.vitorpamplona.amethyst.ui.actions.uploads.ShowImageUploadGallery
@@ -92,14 +93,16 @@ fun ImageVideoDescription(
 
     var selectedServer by remember {
         mutableStateOf(
-            fileServers.firstOrNull { it == defaultServer } ?: fileServers[0],
+            fileServers.firstOrNull { it == defaultServer } ?: fileServers.firstOrNull() ?: DEFAULT_MEDIA_SERVERS[0],
         )
     }
     var message by remember { mutableStateOf("") }
     var sensitiveContent by remember { mutableStateOf(false) }
 
     // 0 = Low, 1 = Medium, 2 = High, 3=UNCOMPRESSED
-    var mediaQualitySlider by remember { mutableIntStateOf(1) }
+    var mediaQualitySlider by remember {
+        mutableIntStateOf(if (uris.hasNonMedia()) 3 else 1)
+    }
 
     // Codec selection: false = H264, true = H265
     var useH265Codec by remember { mutableStateOf(false) }
@@ -189,7 +192,8 @@ fun ImageVideoDescription(
                         fileServers
                             .firstOrNull { it == defaultServer }
                             ?.name
-                            ?: fileServers[0].name,
+                            ?: fileServers.firstOrNull()?.name
+                            ?: DEFAULT_MEDIA_SERVERS[0].name,
                     options = fileServerOptions,
                     onSelect = { selectedServer = fileServers[it] },
                     modifier =
@@ -270,6 +274,9 @@ fun ImageVideoDescription(
                 }
             }
 
+            val firstMedia = uris.first().media
+
+            if (firstMedia.isVideo() == true || firstMedia.isImage() == true || firstMedia.isAudio() == true) {
                 Column(horizontalAlignment = Alignment.CenterHorizontally) {
                     Box(modifier = Modifier.fillMaxWidth()) {
                         Text(
@@ -292,6 +299,7 @@ fun ImageVideoDescription(
                         steps = 2,
                     )
                 }
+            }
 
             if (uris.first().media.isVideo() == true) {
                 SettingSwitchItem(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/utils/ChatFileUploadDialog.kt

@@ -55,6 +55,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.uploads.ShowImageUploadGallery
 import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
 import com.vitorpamplona.amethyst.ui.components.TextSpinner
@@ -196,7 +197,8 @@ private fun ImageVideoPostChat(
                 fileServers
                     .firstOrNull { it == accountViewModel.account.settings.defaultFileServer }
                     ?.name
-                    ?: fileServers[0].name,
+                    ?: fileServers.firstOrNull()?.name
+                    ?: DEFAULT_MEDIA_SERVERS[0].name,
             options = fileServerOptions,
             onSelect = { fileUploadState.selectedServer = fileServers[it] },
         )