General improvements

Author: adalpari

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

@@ -30,6 +30,7 @@ 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.util.AttachmentActionsListener
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

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.util.AttachmentActionsListener
 import org.wordpress.android.ui.compose.components.MainTopAppBar
 import org.wordpress.android.ui.compose.components.NavigationIcons
 import org.wordpress.android.ui.compose.theme.AppThemeM3

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

@@ -243,9 +243,7 @@ class HESupportActivity : AppCompatActivity() {
                                 tags = listOf(category.key),
                             )
                         },
-                        userName = userInfo.userName,
-                        userEmail = userInfo.userEmail,
-                        userAvatarUrl = userInfo.avatarUrl,
+                        userInfo = userInfo,
                         isSendingNewConversation = isSendingNewConversation,
                         onAddImageClick = {
                             val mediaPickerSetup = MediaPickerSetup(

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

@@ -53,12 +53,13 @@ class HESupportViewModel @Inject constructor(
 
     override suspend fun getConversations(): List<SupportConversation> = heSupportRepository.loadConversations()
 
+    @Suppress("TooGenericExceptionCaught")
     fun onSendNewConversation(
         subject: String,
         message: String,
         tags: List<String>,
     ) {
-        viewModelScope.launch {
+        viewModelScope.launch(ioDispatcher) {
             try {
                 _isSendingMessage.value = true
 
@@ -102,8 +103,9 @@ class HESupportViewModel @Inject constructor(
     override suspend fun getConversation(conversationId: Long): SupportConversation? =
         heSupportRepository.loadConversation(conversationId)
 
+    @Suppress("TooGenericExceptionCaught")
     fun onAddMessageToConversation(message: String) {
-        viewModelScope.launch {
+        viewModelScope.launch(ioDispatcher) {
             try {
                 val selectedConversation = _selectedConversation.value
                 if (selectedConversation == null) {
@@ -184,7 +186,7 @@ class HESupportViewModel @Inject constructor(
         }
     }
 
-    @Suppress("TooGenericExceptionCaught")
+    @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
     private suspend fun Uri.toTempFile(): File = withContext(ioDispatcher) {
         try {
             val inputStream = application.contentResolver.openInputStream(this@toTempFile)
@@ -207,6 +209,7 @@ class HESupportViewModel @Inject constructor(
         }
     }
 
+    @Suppress("ReturnCount")
     private fun Uri.getFileExtension(): String {
         // First, try to get extension from MIME type
         val mimeType = application.contentResolver.getType(this)

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

@@ -45,13 +45,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import coil.compose.AsyncImage
 import org.wordpress.android.R
+import org.wordpress.android.support.he.util.AttachmentActionsListener
 import org.wordpress.android.ui.compose.theme.AppThemeM3
 
-interface AttachmentActionsListener {
-    fun onAddImageClick()
-    fun onRemoveImage(uri: Uri)
-}
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TicketMainContentView(
@@ -61,10 +57,7 @@ fun TicketMainContentView(
     onIncludeAppLogsChanged: (Boolean) -> Unit,
     enabled: Boolean = true,
     attachments: List<Uri> = emptyList(),
-    attachmentActionsListener: AttachmentActionsListener = object : AttachmentActionsListener {
-        override fun onAddImageClick() {}
-        override fun onRemoveImage(uri: Uri) {}
-    }
+    attachmentActionsListener: AttachmentActionsListener
 ) {
     Column(
         modifier = Modifier
@@ -281,27 +274,37 @@ private fun ImagePreviewItem(
 
 
 @Preview(showBackground = true, name = "HE main ticket content")
+@Suppress("EmptyFunctionBlock")
 @Composable
 private fun TicketMainContentViewPreview() {
     AppThemeM3(isDarkTheme = false) {
         TicketMainContentView(
             messageText = "",
             includeAppLogs = false,
             onMessageChanged = { },
-            onIncludeAppLogsChanged = { }
+            onIncludeAppLogsChanged = { },
+            attachmentActionsListener = object : AttachmentActionsListener {
+                override fun onAddImageClick() { }
+                override fun onRemoveImage(uri: Uri) { }
+            }
         )
     }
 }
 
 @Preview(showBackground = true, name = "HE main ticket content - Dark", uiMode = UI_MODE_NIGHT_YES)
+@Suppress("EmptyFunctionBlock")
 @Composable
 private fun TicketMainContentViewPreviewDark() {
     AppThemeM3(isDarkTheme = true) {
         TicketMainContentView(
             messageText = "",
             includeAppLogs = false,
             onMessageChanged = { },
-            onIncludeAppLogsChanged = { }
+            onIncludeAppLogsChanged = { },
+            attachmentActionsListener = object : AttachmentActionsListener {
+                override fun onAddImageClick() { }
+                override fun onRemoveImage(uri: Uri) { }
+            }
         )
     }
 }

WordPress/src/main/java/org/wordpress/android/support/he/util/AttachmentActionsListener.kt

@@ -0,0 +1,8 @@
+package org.wordpress.android.support.he.util
+
+import android.net.Uri
+
+interface AttachmentActionsListener {
+    fun onAddImageClick()
+    fun onRemoveImage(uri: Uri)
+}