fix and improve upload progress in chat

  Bundles the fixes and follow-up polish for the upload-progress/placeholder
  feature from the recent merge-conflict cleanup:

  Correctness fixes:
  - UploadAndShareFilesWorker called shareFile() unconditionally after every
    successful upload, even though two other paths already share the file
    themselves: ChunkedFileUploader still had a leftover
    ShareOperationWorker.shareFile() call, so any chunked upload (files >1MB)
    without conversation subfolders posted the attachment twice; and
    conversation-subfolder uploads already share via postConversationAttachment,
    so the extra call tried to share a path the file was never uploaded to,
    failed, and incorrectly marked successful uploads as FAILED.
  - uploadUsingConversationSubfolders() sent a freshly generated UUID as the
    message's referenceId instead of the placeholder's actual referenceId, so
    the server echoed back the wrong id and the temp placeholder could never
    be matched against the real incoming message, leaving it stuck forever.
  - sendUnsentChatMessages() (resend-on-reconnect) picked up FAILED upload
    placeholders and reposted their "{file}" sentinel text as a bogus new
    message. Placeholders with a file attachment are now excluded from that
    resend path.
  - The "upload completed" signal that triggers an immediate message refetch
    was commented out, so a successfully uploaded video's placeholder could
    spin forever until the chat was closed and reopened.
  - Coil's AsyncImage never showed a composable-supplied fallback painter when
    passed a pre-built ImageRequest with null data, so previews without a
    server URL (e.g. video with no server preview) silently fell back to
    Coil's own null-data handling instead of our local first-frame image.

  Reliability:
  - UploadAndShareFilesWorker now retries transient network failures (socket
    resets, timeouts) with backoff and a network-connected constraint instead
    of failing immediately, up to a bounded number of attempts.

  UI/UX:
  - Replaced the linear upload progress bar with a WhatsApp-style circular
    spinner overlay (with cancel button) centered on the thumbnail, and fixed
    a metadata-layout bug that left a padding gap next to the placeholder.
  - Removed the persistent Android notifications duplicating in-chat upload/
    compression progress; kept the upload-failed notification.
  - Stopped treating a file's name as its caption; only real captions are
    shown, matching how sent messages already behave.
  - Sized the video upload placeholder to the video's real aspect ratio
    (16:9 fallback) instead of collapsing to a small generic icon.
  - Added a local-first-frame fallback, cached to disk keyed by referenceId,
    for videos whose server preview is unavailable, so they don't show a
    generic icon indefinitely.
  - The play button overlay now shows on all video messages (not just ones
    with a server preview) with a WhatsApp-style semi-transparent dark circle
    behind it.

  Assisted-by: Claude:claude-sonnet-5

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -160,6 +160,7 @@ import com.nextcloud.talk.ui.chat.ChatView
 import com.nextcloud.talk.ui.chat.ChatViewCallbacks
 import com.nextcloud.talk.ui.chat.ChatViewState
 import com.nextcloud.talk.ui.chat.LocalUploadProgressProvider
+import com.nextcloud.talk.ui.chat.LocalUploadedLocalPreviewProvider
 import com.nextcloud.talk.ui.dialog.DateTimeCompose
 import com.nextcloud.talk.ui.dialog.GetPinnedOptionsDialog
 import com.nextcloud.talk.ui.dialog.SaveToStorageDialogFragment
@@ -792,12 +793,14 @@ class ChatActivity :
                 SideEffect { chatListState = listState }
 
                 val uploadProgressMap by chatViewModel.uploadProgressMap.collectAsStateWithLifecycle()
+                val uploadedLocalPreviewMap by chatViewModel.uploadedLocalPreviewMap.collectAsStateWithLifecycle()
 
                 CompositionLocalProvider(
                     LocalViewThemeUtils provides viewThemeUtils,
                     LocalMessageUtils provides messageUtils,
                     LocalOpenGraphFetcher provides { url -> chatViewModel.fetchOpenGraph(url) },
-                    LocalUploadProgressProvider provides { refId -> uploadProgressMap[refId] }
+                    LocalUploadProgressProvider provides { refId -> uploadProgressMap[refId] },
+                    LocalUploadedLocalPreviewProvider provides { refId -> uploadedLocalPreviewMap[refId] }
                 ) {
                     val currentlyPlayingId by chatViewModel.currentlyPlayedMessageId.collectAsState(null)
 

app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt

@@ -135,6 +135,7 @@ interface ChatMessageRepository : LifecycleAwareManager {
     @Suppress("LongParameterList")
     suspend fun addUploadPlaceholderMessage(
         localFileUri: String,
+        fileName: String,
         caption: String,
         mimeType: String?,
         fileSize: Long,

app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt

@@ -666,6 +666,7 @@ class OfflineFirstChatRepository @Inject constructor(
     @Suppress("Detekt.TooGenericExceptionCaught", "LongMethod")
     override suspend fun addUploadPlaceholderMessage(
         localFileUri: String,
+        fileName: String,
         caption: String,
         mimeType: String?,
         fileSize: Long,
@@ -693,7 +694,7 @@ class OfflineFirstChatRepository @Inject constructor(
 
                 val fileParams = hashMapOf<String?, String?>(
                     "type" to "file",
-                    "name" to caption,
+                    "name" to fileName,
                     "mimetype" to (mimeType ?: ""),
                     "size" to fileSize.toString(),
                     "path" to localFileUri
@@ -707,7 +708,8 @@ class OfflineFirstChatRepository @Inject constructor(
                     internalConversationId = internalConversationId,
                     id = placeholderId,
                     threadId = threadId,
-                    message = "{file}",
+                    // "{file}" is the sentinel the server (and rest of this app) uses for "no caption"
+                    message = caption.ifEmpty { "{file}" },
                     deleted = false,
                     token = conversationModel.token,
                     actorId = currentUser.userId!!,
@@ -777,7 +779,11 @@ class OfflineFirstChatRepository @Inject constructor(
 
     override suspend fun sendUnsentChatMessages(credentials: String, url: String) {
         val tempMessages = chatDao.getTempUnsentMessagesForConversation(internalConversationId, threadId).first()
-        tempMessages.sortedBy { it.internalId }.onEach {
+        // File-upload placeholders are also temporary messages, but they must never be resent as plain
+        // text here: their "message" field is just the "{file}" sentinel, and a failed/interrupted upload
+        // needs a real re-upload, not a bogus text message reusing its referenceId.
+        val unsentTextMessages = tempMessages.filterNot { it.messageParameters?.containsKey("file") == true }
+        unsentTextMessages.sortedBy { it.internalId }.onEach {
             sendChatMessage(
                 credentials,
                 url,

app/src/main/java/com/nextcloud/talk/chat/ui/model/ChatMessageUi.kt

@@ -81,7 +81,8 @@ sealed interface MessageTypeContent {
 
     data class UploadingMedia(
         val localFileUri: String,
-        val caption: String,
+        val fileName: String,
+        val caption: String?,
         val mimeType: String?,
         val drawableResourceId: Int
     ) : MessageTypeContent
@@ -276,12 +277,15 @@ fun getMessageTypeContent(user: User, message: ChatMessage, isClassified: Boolea
             ?: MessageTypeContent.RegularText
     }
 
+private const val FILE_PLACEHOLDER_MESSAGE = "{file}"
+
 fun getUploadingMediaContent(message: ChatMessage): MessageTypeContent.UploadingMedia {
     val mimetype = message.fileParameters.mimetype
     val drawableResourceId = DrawableUtils.getDrawableResourceIdForMimeType(mimetype)
     return MessageTypeContent.UploadingMedia(
         localFileUri = message.fileParameters.path.orEmpty(),
-        caption = message.fileParameters.name.orEmpty(),
+        fileName = message.fileParameters.name.orEmpty(),
+        caption = message.message.takeIf { it != FILE_PLACEHOLDER_MESSAGE },
         mimeType = mimetype.takeIf { !it.isNullOrEmpty() },
         drawableResourceId = drawableResourceId
     )

app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt

@@ -225,6 +225,12 @@ class ChatViewModel @AssistedInject constructor(
     private val _uploadProgressMap = MutableStateFlow<Map<String, Int>>(emptyMap())
     val uploadProgressMap: StateFlow<Map<String, Int>> = _uploadProgressMap
 
+    // Maps referenceId -> local device fileUri, kept around for a while after the upload finishes so the
+    // final message can show the file we already have on disk instead of a generic mimetype icon while it
+    // waits for the server-side preview to load for the first time.
+    private val _uploadedLocalPreviewMap = MutableStateFlow<Map<String, String>>(emptyMap())
+    val uploadedLocalPreviewMap: StateFlow<Map<String, String>> = _uploadedLocalPreviewMap
+
     // Maps referenceId -> fileUri for cancellation support
     private val uploadReferenceToUri = mutableMapOf<String, String>()
 
@@ -235,6 +241,7 @@ class ChatViewModel @AssistedInject constructor(
             chatRepository.deleteTempMessageByReferenceId(referenceId)
         }
         _uploadProgressMap.update { it - referenceId }
+        _uploadedLocalPreviewMap.update { it - referenceId }
     }
 
     fun getChatRepository(): ChatMessageRepository = chatRepository
@@ -2077,7 +2084,8 @@ class ChatViewModel @AssistedInject constructor(
                 viewModelScope.launch {
                     chatRepository.addUploadPlaceholderMessage(
                         localFileUri = fileUri,
-                        caption = caption.ifEmpty { fileName },
+                        fileName = fileName,
+                        caption = caption,
                         mimeType = mimeType,
                         fileSize = fileSize,
                         referenceId = referenceId
@@ -2087,17 +2095,18 @@ class ChatViewModel @AssistedInject constructor(
 
             val internalConversationId = "${currentUser.id}@$chatRoomToken"
             val workerId = UploadAndShareFilesWorker.upload(
-                fileUri,
-                room,
-                displayName,
-                metaData,
-                compressImages,
-                referenceId,
-                internalConversationId
+                fileUri = fileUri,
+                roomToken = room,
+                conversationName = displayName,
+                metaData = metaData,
+                referenceId = referenceId,
+                internalConversationId = internalConversationId,
+                compressImages = compressImages
             )
 
             if (!isVoiceMessage) {
                 uploadReferenceToUri[referenceId] = fileUri
+                _uploadedLocalPreviewMap.update { it + (referenceId to fileUri) }
                 observeUploadProgress(workerId, referenceId)
             }
         } catch (e: IllegalArgumentException) {
@@ -2134,6 +2143,10 @@ class ChatViewModel @AssistedInject constructor(
                 if (workInfo.state.isFinished) {
                     _uploadProgressMap.update { it - referenceId }
                     uploadReferenceToUri.remove(referenceId)
+                    viewModelScope.launch {
+                        delay(LOCAL_PREVIEW_GRACE_PERIOD_MS)
+                        _uploadedLocalPreviewMap.update { it - referenceId }
+                    }
                 }
             }
             .launchIn(viewModelScope)
@@ -2493,7 +2506,7 @@ class ChatViewModel @AssistedInject constructor(
         private const val LOAD_MORE_MESSAGES_LIMIT = 100
         private const val POST_UPLOAD_FETCH_MAX_ATTEMPTS = 4
         private const val POST_UPLOAD_FETCH_RETRY_DELAY_MS = 1_500L
-
+        private const val LOCAL_PREVIEW_GRACE_PERIOD_MS = 15_000L
         private const val PLAUSIBLE_MESSAGE_ID_BUFFER = 10_000L
 
         fun isPlausibleLastReadMessageId(messageId: Int, newestKnownRealMessageId: Long?): Boolean =