CMM-927 support attachments limit (#22338)

adalpari · web-flow · commit e29bad70fa37 · 2025-11-10T08:32:33.000Z
* Adding basic UI

* Renaming

* Some styling

* Renaming and dummy data

* Using proper "new conversation icon"

* Conversation details screen

* Creating the reply bottomsheet

* Linking to the support screen

* bottomsheet fix

* Mov navigation form activity to viewmodel

* Adding create ticket screen

* More screen adjustments

* Extracting common code

* Margin fix

* detekt

* Style

* New ticket check

* Creating tests

* Creating repository and load conversations function

* Adding createConversation function

* Creating loadConversation func

* Loading conversations form the viewmodel

* Adding loading spinner

* Pull to refresh

* Proper ionitialization

* Adding empty screen

* Handling send new conversation

* Show loading when sending

* New ticket creation fix

* Using snackbar for errors

* Error handling

* Answering conversation

* Adding some test to the repository

* More tests!

* Compile fixes

* Similarities improvements

* Using snackbar in bots activity

* Extracting EmptyConversationsView

* Renaming

* Extracting VM and UI common code

* Extracting navigation common code

* Renaming VMs for clarification

* More refactor

* Capitalise text fields

* Updating rs library

* Loading conversation UX

* Style fix

* Fixing scaffolds paddings

* userID fix

* Fixing the padding problem in bot chat when the keyboard is opened

* Apply padding to create ticket screen when the keyboard is opened

* Fixing scroll state in reply bottomsheet

* Adding tests for the new common viewmodel

* Fixing AIBotSupportViewModel tests

* detekt

* Improvements int he conversation interaction

* Adding tests for HE VM

* Saving draft state

* Properly navigating when a ticket is selected

* Error parsing improvement

* accessToken suggestion improvements

* General suggestions

* Send message error UX improvement

* Fixing tests

* Converting the UI to more AndroidMaterial style

* Bots screen renaming

* Bots screens renaming

* Make NewTicket screen more Android Material theme as well

* Adding preview for EmptyConversationsView

* Button fix

* detekt

* Ticket selection change

* Supporting markdown text

* detekt

* Improving MarkdownUtils

* Formatting text in the repository layer instead the ui

* Renaming

* Fixing tests

* Support pagination

* Triggering in the 4th element

* detekt

* TODO for debug purposes

* Claude PR suggestions

Mutex and constant

* Put ConversationListView in common between bots and HE

* Empty and error state

* Skip site capitalization

* Adding a11c labels

* Adding headings labels

* adding accessible labels to chat bubbles

* detekt

* Fixing tests

* PR suggestion about bot chat bubble

* Fixing tests

* Updating rust

* Adding attachments UI

* Parsing markdown more exhaustively

* New links support

* Detekt

* Supporting in conversation as well

* Keeping the screen when select images

* Add attachments to the message data class

* Showing attachments in the UI

* Downloading attachments

* detekt

* Support pagination

* Triggering in the 4th element

* detekt

* TODO for debug purposes

* Claude PR suggestions

Mutex and constant

* Detekt

* Removing testing code

* Updating RS library version

* Opening images in fullscreen

* Improving full screen image UX

* Improving semantics

* Extracting strings

* Using rs PR fix

* Showing attachment preview

* Clearing attachments on new ticket screen close

* Removing selected images limit

* Unifying attachments handling inside the VM

* Using a launcher instead of startActivityForResult

* Remove unused parameter

* Handling temp files inside the VM

* Removing files

* detekt

* Throwing copy file error

* Extracting some individual composables from HEConversation screen file

* Reducing arguments

* Catch file creation error

* Using proper file extension

* General improvements

* Update RS version and some fixes

* Extracting temp attachment utils

* Adding new tests

* Some refactoring

* Removing attachments preview to open a dedicated PR

* Useless changes

* Useless changes

* Minor refactor

* Showing attachments previews

* Typo

* String fix

* Fixing pan issue

* Passing attachments directly instead of searching for then when tapped for full screen

* Compile fix

* Fixing the send state message

* Checking network availability

* Saving message state when error

* Tests

* Reverting non-related commits done by mistake

* Checking attachments size

* Showing skipped files more intuitively

* Detekt

* Fixing and adding tests

* detekt

* PR suggestions

* Fixing the incongruence between tests and rejection reason priority

* Some refactor

* Using a progressbar and retry adding skipped files

* Fixing tests
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/model/AttachmentState.kt b/WordPress/src/main/java/org/wordpress/android/support/he/model/AttachmentState.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.support.he.model
+
+import android.net.Uri
+
+data class AttachmentState(
+    val acceptedUris: List<Uri> = emptyList(),
+    val rejectedUris: List<Uri> = emptyList(),
+    val currentTotalSizeBytes: Long = 0L,
+    val rejectedTotalSizeBytes: Long = 0L
+)
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/model/MessageSendResult.kt b/WordPress/src/main/java/org/wordpress/android/support/he/model/MessageSendResult.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.support.he.model
+
+sealed class MessageSendResult {
+    data object Success : MessageSendResult()
+    data object Failure : MessageSendResult()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt
@@ -60,6 +60,8 @@ import coil.request.ImageRequest
 import coil.request.videoFrameMillis
 import org.wordpress.android.R
 import org.wordpress.android.support.aibot.util.formatRelativeTime
+import org.wordpress.android.support.he.model.AttachmentState
+import org.wordpress.android.support.he.model.MessageSendResult
 import org.wordpress.android.support.he.model.AttachmentType
 import org.wordpress.android.support.he.model.SupportAttachment
 import org.wordpress.android.support.he.model.SupportConversation
@@ -77,11 +79,11 @@ fun HEConversationDetailScreen(
     conversation: SupportConversation,
     isLoading: Boolean = false,
     isSendingMessage: Boolean = false,
-    messageSendResult: HESupportViewModel.MessageSendResult? = null,
+    messageSendResult: MessageSendResult? = null,
     onBackClick: () -> Unit,
     onSendMessage: (message: String, includeAppLogs: Boolean) -> Unit,
     onClearMessageSendResult: () -> Unit = {},
-    attachments: List<Uri> = emptyList(),
+    attachmentState: AttachmentState = AttachmentState(),
     attachmentActionsListener: AttachmentActionsListener,
     onDownloadAttachment: (SupportAttachment) -> Unit = {},
     videoUrlResolver: org.wordpress.android.support.he.util.VideoUrlResolver? = null
@@ -178,7 +180,7 @@ fun HEConversationDetailScreen(
         LaunchedEffect(messageSendResult) {
             if (messageSendResult != null) {
                 // Clear draft only on success
-                if (messageSendResult is HESupportViewModel.MessageSendResult.Success) {
+                if (messageSendResult is MessageSendResult.Success) {
                     draftMessageText = ""
                     draftIncludeAppLogs = false
                 }
@@ -211,7 +213,13 @@ fun HEConversationDetailScreen(
                 draftMessageText = message
                 onSendMessage(message, includeAppLogs)
             },
-            attachments = attachments,
+            onMessageSentSuccessfully = {
+                // Clear draft after successful send
+                draftMessageText = ""
+                draftIncludeAppLogs = false
+                onClearMessageSendResult()
+            },
+            attachmentState = attachmentState,
             attachmentActionsListener = attachmentActionsListener
         )
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationReplyBottomSheet.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationReplyBottomSheet.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.support.he.ui
 
-import android.net.Uri
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -17,6 +16,7 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -29,24 +29,47 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import org.wordpress.android.R
+import org.wordpress.android.support.he.model.AttachmentState
+import org.wordpress.android.support.he.model.MessageSendResult
 import org.wordpress.android.support.he.util.AttachmentActionsListener
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HEConversationReplyBottomSheet(
     sheetState: androidx.compose.material3.SheetState,
     isSending: Boolean = false,
+    messageSendResult: MessageSendResult? = null,
     initialMessageText: String = "",
     initialIncludeAppLogs: Boolean = false,
     onDismiss: (currentMessage: String, currentIncludeAppLogs: Boolean) -> Unit,
     onSend: (String, Boolean) -> Unit,
-    attachments: List<Uri> = emptyList(),
+    onMessageSentSuccessfully: () -> Unit,
+    attachmentState: AttachmentState = AttachmentState(),
     attachmentActionsListener: AttachmentActionsListener
 ) {
     var messageText by remember { mutableStateOf(initialMessageText) }
     var includeAppLogs by remember { mutableStateOf(initialIncludeAppLogs) }
     val scrollState = rememberScrollState()
 
+    // Close the sheet when sending completes successfully
+    LaunchedEffect(messageSendResult) {
+        when (messageSendResult) {
+            is MessageSendResult.Success -> {
+                // Message sent successfully, close the sheet and clear draft
+                onDismiss("", false)
+                onMessageSentSuccessfully()
+            }
+            is MessageSendResult.Failure -> {
+                // Message failed to send, draft is saved onDismiss
+                // The error will be shown via snackbar from the Activity
+                onDismiss("", false)
+            }
+            null -> {
+                // No result yet, do nothing
+            }
+        }
+    }
+
     ModalBottomSheet(
         onDismissRequest = { onDismiss(messageText, includeAppLogs) },
         sheetState = sheetState
@@ -107,7 +130,7 @@ fun HEConversationReplyBottomSheet(
                 onMessageChanged = { message -> messageText = message },
                 onIncludeAppLogsChanged = { checked -> includeAppLogs = checked },
                 enabled = !isSending,
-                attachments = attachments,
+                attachmentState = attachmentState,
                 attachmentActionsListener = attachmentActionsListener
             )
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt
@@ -55,6 +55,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import org.wordpress.android.R
 import org.wordpress.android.support.common.model.UserInfo
+import org.wordpress.android.support.he.model.AttachmentState
 import org.wordpress.android.support.he.util.AttachmentActionsListener
 import org.wordpress.android.ui.compose.components.MainTopAppBar
 import org.wordpress.android.ui.compose.components.NavigationIcons
@@ -74,8 +75,8 @@ fun HENewTicketScreen(
             ) -> Unit,
     userInfo: UserInfo,
     isSendingNewConversation: Boolean = false,
-    attachments: List<Uri> = emptyList(),
-    attachmentActionsListener: AttachmentActionsListener,
+    attachmentState: AttachmentState = AttachmentState(),
+    attachmentActionsListener: AttachmentActionsListener
 ) {
     var selectedCategory by remember { mutableStateOf<SupportCategory?>(null) }
     var subject by remember { mutableStateOf("") }
@@ -197,7 +198,7 @@ fun HENewTicketScreen(
                 includeAppLogs = includeAppLogs,
                 onMessageChanged = { message -> messageText = message },
                 onIncludeAppLogsChanged = { checked -> includeAppLogs = checked },
-                attachments = attachments,
+                attachmentState = attachmentState,
                 attachmentActionsListener = attachmentActionsListener
             )
 
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportActivity.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportActivity.kt
@@ -173,7 +173,7 @@ class HESupportActivity : AppCompatActivity() {
                     val isLoadingConversation by viewModel.isLoadingConversation.collectAsState()
                     val isSendingMessage by viewModel.isSendingMessage.collectAsState()
                     val messageSendResult by viewModel.messageSendResult.collectAsState()
-                    val attachments by viewModel.attachments.collectAsState()
+                    val attachmentState by viewModel.attachmentState.collectAsState()
 
                     selectedConversation?.let { conversation ->
                         HEConversationDetailScreen(
@@ -190,7 +190,7 @@ class HESupportActivity : AppCompatActivity() {
                                 )
                             },
                             onClearMessageSendResult = { viewModel.clearMessageSendResult() },
-                            attachments = attachments,
+                            attachmentState = attachmentState,
                             attachmentActionsListener = createAttachmentActionListener(),
                             onDownloadAttachment = { attachment ->
                                 // Show loading snackbar
@@ -213,7 +213,7 @@ class HESupportActivity : AppCompatActivity() {
                 composable(route = ConversationScreen.NewTicket.name) {
                     val userInfo by viewModel.userInfo.collectAsState()
                     val isSendingNewConversation by viewModel.isSendingMessage.collectAsState()
-                    val attachments by viewModel.attachments.collectAsState()
+                    val attachmentState by viewModel.attachmentState.collectAsState()
 
                     // Clear attachments when leaving the new ticket screen
                     androidx.compose.runtime.DisposableEffect(Unit) {
@@ -234,7 +234,7 @@ class HESupportActivity : AppCompatActivity() {
                         },
                         userInfo = userInfo,
                         isSendingNewConversation = isSendingNewConversation,
-                        attachments = attachments,
+                        attachmentState = attachmentState,
                         attachmentActionsListener = createAttachmentActionListener()
                     )
                 }
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportViewModel.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportViewModel.kt
@@ -1,5 +1,6 @@
 package org.wordpress.android.support.he.ui
 
+import android.app.Application
 import android.net.Uri
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -8,10 +9,13 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.modules.IO_THREAD
 import org.wordpress.android.support.common.ui.ConversationsSupportViewModel
+import org.wordpress.android.support.he.model.AttachmentState
+import org.wordpress.android.support.he.model.MessageSendResult
 import org.wordpress.android.support.he.model.SupportConversation
 import org.wordpress.android.support.he.repository.CreateConversationResult
 import org.wordpress.android.support.he.repository.HESupportRepository
@@ -26,24 +30,23 @@ class HESupportViewModel @Inject constructor(
     private val heSupportRepository: HESupportRepository,
     @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
     private val tempAttachmentsUtil: TempAttachmentsUtil,
+    private val application: Application,
     accountStore: AccountStore,
     appLogWrapper: AppLogWrapper,
     networkUtilsWrapper: NetworkUtilsWrapper,
 ) : ConversationsSupportViewModel<SupportConversation>(accountStore, appLogWrapper, networkUtilsWrapper) {
+    companion object {
+        const val MAX_TOTAL_SIZE_BYTES = 20L * 1024 * 1024 // 20MB total
+    }
     private val _isSendingMessage = MutableStateFlow(false)
     val isSendingMessage: StateFlow<Boolean> = _isSendingMessage.asStateFlow()
 
     private val _messageSendResult = MutableStateFlow<MessageSendResult?>(null)
     val messageSendResult: StateFlow<MessageSendResult?> = _messageSendResult.asStateFlow()
 
-    // Attachment state (shared for both Detail and NewTicket screens)
-    private val _attachments = MutableStateFlow<List<Uri>>(emptyList())
-    val attachments: StateFlow<List<Uri>> = _attachments.asStateFlow()
-
-    sealed class MessageSendResult {
-        data object Success : MessageSendResult()
-        data object Failure : MessageSendResult()
-    }
+    // Unified attachment state (shared for both Detail and NewTicket screens)
+    private val _attachmentState = MutableStateFlow(AttachmentState())
+    val attachmentState: StateFlow<AttachmentState> = _attachmentState.asStateFlow()
 
     override fun initRepository(accessToken: String) {
         heSupportRepository.init(accessToken)
@@ -66,7 +69,7 @@ class HESupportViewModel @Inject constructor(
 
                 _isSendingMessage.value = true
 
-                val files = tempAttachmentsUtil.createTempFilesFrom(_attachments.value)
+                val files = tempAttachmentsUtil.createTempFilesFrom(_attachmentState.value.acceptedUris)
 
                 when (val result = heSupportRepository.createConversation(
                     subject = subject,
@@ -79,7 +82,7 @@ class HESupportViewModel @Inject constructor(
                         // update conversations locally
                         _conversations.value = listOf(newConversation) + _conversations.value
                         // Clear attachments after successful creation
-                        _attachments.value = emptyList()
+                        _attachmentState.value = AttachmentState()
                         onBackClick()
                     }
 
@@ -126,7 +129,7 @@ class HESupportViewModel @Inject constructor(
                 }
 
                 _isSendingMessage.value = true
-                val files = tempAttachmentsUtil.createTempFilesFrom(_attachments.value)
+                val files = tempAttachmentsUtil.createTempFilesFrom(_attachmentState.value.acceptedUris)
 
                 when (val result = heSupportRepository.addMessageToConversation(
                     conversationId = selectedConversation.id,
@@ -137,7 +140,7 @@ class HESupportViewModel @Inject constructor(
                         _selectedConversation.value = result.conversation
                         _messageSendResult.value = MessageSendResult.Success
                         // Clear attachments after successful message send
-                        _attachments.value = emptyList()
+                        _attachmentState.value = AttachmentState()
                     }
 
                     is CreateConversationResult.Error.Forbidden -> {
@@ -170,15 +173,103 @@ class HESupportViewModel @Inject constructor(
     }
 
     fun addAttachments(uris: List<Uri>) {
-        _attachments.value = _attachments.value + uris
+        viewModelScope.launch(ioDispatcher) {
+            _attachmentState.value = validateAndCreateAttachmentState(uris)
+        }
+    }
+
+    @Suppress("LoopWithTooManyJumpStatements")
+    private suspend fun validateAndCreateAttachmentState(uris: List<Uri>): AttachmentState = withContext(ioDispatcher) {
+        if (uris.isEmpty()) {
+            return@withContext _attachmentState.value
+        }
+
+        val validUris = mutableListOf<Uri>()
+        val skippedUris = mutableListOf<Uri>()
+
+        // Calculate current total size
+        var currentTotalSize = calculateTotalSize(_attachmentState.value.acceptedUris)
+
+        // Validate each new attachment
+        for (uri in uris) {
+            val fileSize = getFileSize(uri)
+
+            // Skip if we can't determine file size we just allow it to be added
+            if (fileSize != null) {
+                // Check if adding this file would exceed total size limit
+                if (currentTotalSize + fileSize > MAX_TOTAL_SIZE_BYTES) {
+                    skippedUris.add(uri)
+                    continue
+                }
+            }
+
+            // File is valid, add it
+            validUris.add(uri)
+            currentTotalSize += fileSize ?: 0
+        }
+
+        // Build the new attachment state
+        val currentAccepted = _attachmentState.value.acceptedUris
+        val newAccepted = currentAccepted + validUris
+
+        // Calculate rejected total size
+        val rejectedTotalSize = calculateTotalSize(skippedUris)
+
+        AttachmentState(
+            acceptedUris = newAccepted,
+            rejectedUris = skippedUris,
+            currentTotalSizeBytes = currentTotalSize,
+            rejectedTotalSizeBytes = rejectedTotalSize
+        )
+    }
+
+    @Suppress("TooGenericExceptionCaught")
+    private suspend fun getFileSize(uri: Uri): Long? = withContext(ioDispatcher) {
+        try {
+            application.contentResolver.openAssetFileDescriptor(uri, "r")?.use { descriptor ->
+                descriptor.length
+            }
+        } catch (e: Exception) {
+            appLogWrapper.d(AppLog.T.SUPPORT, "Could not determine file size for URI: $uri - ${e.message}")
+            // Silently return null if we can't get the file size
+            // This will be handled by the validation logic
+            null
+        }
     }
 
+    /**
+     * Calculates the total size of all files in the list
+     * @param uris List of URIs to calculate size for
+     * @return Total size in bytes
+     */
+    private suspend fun calculateTotalSize(uris: List<Uri>): Long {
+        var totalSize = 0L
+        for (uri in uris) {
+            totalSize += getFileSize(uri) ?: 0L
+        }
+        return totalSize
+    }
+
+    /**
+     * Removes an attachment from the accepted list and attempts to re-include any previously
+     * skipped files that can now fit within the size limit.
+     *
+     * This function removes the specified URI and then re-validates all previously skipped files
+     * by calling [addAttachments], which ensures consistent validation logic and automatically
+     * includes files that now fit within the available space.
+     */
     fun removeAttachment(uri: Uri) {
-        _attachments.value = _attachments.value.filter { it != uri }
+        viewModelScope.launch {
+            // Remove the attachment and re-validate skipped files
+            val currentState = _attachmentState.value.copy()
+            val newAcceptedUris = currentState.acceptedUris.filter { it != uri }
+            _attachmentState.value = currentState.copy(acceptedUris = newAcceptedUris)
+            addAttachments(currentState.rejectedUris)
+        }
     }
 
     fun clearAttachments() {
-        _attachments.value = emptyList()
+        _attachmentState.value = AttachmentState()
     }
 
     fun notifyGeneralError() {
diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/TicketMainContentView.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/TicketMainContentView.kt
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
diff --git a/WordPress/src/test/java/org/wordpress/android/support/he/ui/HESupportViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/support/he/ui/HESupportViewModelTest.kt
