Update RS version and some fixes

Author: adalpari

WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportActivity.kt

@@ -29,10 +29,12 @@ import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.support.common.ui.ConversationsSupportViewModel
+import org.wordpress.android.support.common.ui.ConversationsSupportViewModel.ErrorType
 import org.wordpress.android.ui.photopicker.MediaPickerConstants
 import org.wordpress.android.ui.reader.ReaderFileDownloadManager
 import org.wordpress.android.ui.mediapicker.MediaPickerSetup
 import org.wordpress.android.ui.mediapicker.MediaType
+import org.wordpress.android.util.AppLog
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -44,15 +46,22 @@ class HESupportActivity : AppCompatActivity() {
     private lateinit var composeView: ComposeView
     private lateinit var navController: NavHostController
 
+    @Suppress("TooGenericExceptionCaught")
     private val photoPickerLauncher = registerForActivityResult(
         androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult()
     ) { result ->
-        if (result.resultCode == RESULT_OK && result.data != null) {
-            val uris = result.data?.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)
-            uris?.let { uriStrings ->
-                val newUris = uriStrings.map { it.toUri() }
-                viewModel.addAttachments(newUris)
+        try {
+            if (result.resultCode == RESULT_OK && result.data != null) {
+                val uris = result.data?.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)
+                uris?.let { uriStrings ->
+                    val newUris = uriStrings.map { it.toUri() }
+                    viewModel.addAttachments(newUris)
+                }
             }
+        } catch (e: Exception) {
+            viewModel.notifyGeneralError()
+            appLogWrapper.e(
+                AppLog.T.SUPPORT, "Error getting attachments to add: ${e.stackTraceToString()}")
         }
     }
 

WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportViewModel.kt

@@ -95,7 +95,10 @@ class HESupportViewModel @Inject constructor(
                 _isSendingMessage.value = false
             } catch (e: Exception) {
                 _errorMessage.value = ErrorType.GENERAL
-                appLogWrapper.e(AppLog.T.SUPPORT, "Error creating HE conversation")
+                appLogWrapper.e(
+                    AppLog.T.SUPPORT,
+                    "Error creating HE conversation ${e.stackTraceToString()}"
+                )
             }
         }
     }
@@ -145,8 +148,10 @@ class HESupportViewModel @Inject constructor(
                 _isSendingMessage.value = false
             } catch (e: Exception) {
                 _errorMessage.value = ErrorType.GENERAL
-                appLogWrapper.e(AppLog.T.SUPPORT, "Error adding message to HE conversation: " +
-                e.stackTraceToString())
+                appLogWrapper.e(
+                    AppLog.T.SUPPORT,
+                    "Error adding message to HE conversation: ${e.stackTraceToString()}"
+                )
             }
         }
     }
@@ -167,6 +172,10 @@ class HESupportViewModel @Inject constructor(
         _attachments.value = emptyList()
     }
 
+    fun notifyGeneralError() {
+        _errorMessage.value = ErrorType.GENERAL
+    }
+
     @Suppress("TooGenericExceptionCaught")
     private suspend fun copyUrisToTempFiles(uris: List<Uri>): List<File> = withContext(ioDispatcher) {
         uris.map{ it.toTempFile() }
@@ -175,11 +184,13 @@ class HESupportViewModel @Inject constructor(
     @Suppress("TooGenericExceptionCaught")
     private suspend fun removeTempFiles(files: List<File>) = withContext(ioDispatcher) {
         try {
+            var removed = files.isEmpty() // If empty, count them as removed
             files.forEach { file ->
                 if (file.exists()) {
-                    file.delete()
+                    removed = removed && file.delete()
                 }
             }
+            removed
         } catch (e: Exception) {
             appLogWrapper.e(AppLog.T.SUPPORT, "Error removing attachment temp files temp files: " +
                     e.stackTraceToString())

gradle/libs.versions.toml

@@ -101,8 +101,7 @@ wellsql = '2.0.0'
 wordpress-aztec = 'v2.1.4'
 wordpress-lint = '2.2.0'
 wordpress-persistent-edittext = '1.0.2'
-## TODO: Use trunk commit when merge
-wordpress-rs = '995-5b34ff29422a4db847044c72bd06672be922af22'
+wordpress-rs = 'trunk-fb107b497caaf2b1f4ffcf9f487784792561a645'
 wordpress-utils = '3.14.0'
 automattic-ucrop = '2.2.11'
 zendesk = '5.5.1'