Linking UI with the new logs upload methods

Author: adalpari

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

@@ -71,6 +71,7 @@ fun HENewTicketScreen(
         subject: String,
         messageText: String,
         siteAddress: String,
+        includeAppLogs: Boolean,
             ) -> Unit,
     userInfo: UserInfo,
     isSendingNewConversation: Boolean = false,
@@ -98,7 +99,7 @@ fun HENewTicketScreen(
                 isLoading = isSendingNewConversation,
                 onClick = {
                     selectedCategory?.let { category ->
-                        onSubmit(category, subject, messageText, siteAddress)
+                        onSubmit(category, subject, messageText, siteAddress, includeAppLogs)
                     }
                 }
             )
@@ -423,7 +424,7 @@ private fun HENewTicketScreenPreview() {
         HENewTicketScreen(
             snackbarHostState = snackbarHostState,
             onBackClick = { },
-            onSubmit = { _, _, _, _-> },
+            onSubmit = { _, _, _, _, _ -> },
             userInfo = UserInfo("Test user", "test.user@automattic.com", null),
             attachmentActionsListener = object : AttachmentActionsListener {
                 override fun onAddImageClick() {
@@ -445,7 +446,7 @@ private fun HENewTicketScreenPreviewDark() {
         HENewTicketScreen(
             snackbarHostState = snackbarHostState,
             onBackClick = { },
-            onSubmit = { _, _, _, _ -> },
+            onSubmit = { _, _, _, _, _ -> },
             userInfo = UserInfo("Test user", "test.user@automattic.com", null),
             attachmentActionsListener = object : AttachmentActionsListener {
                 override fun onAddImageClick() {
@@ -467,7 +468,7 @@ private fun HENewTicketScreenWordPressPreview() {
         HENewTicketScreen(
             snackbarHostState = snackbarHostState,
             onBackClick = { },
-            onSubmit = { _, _, _, _ -> },
+            onSubmit = { _, _, _, _, _ -> },
             userInfo = UserInfo("Test user", "test.user@automattic.com", null),
             attachmentActionsListener = object : AttachmentActionsListener {
                 override fun onAddImageClick() {
@@ -489,7 +490,7 @@ private fun HENewTicketScreenPreviewWordPressDark() {
         HENewTicketScreen(
             snackbarHostState = snackbarHostState,
             onBackClick = { },
-            onSubmit = { _, _, _, _ -> },
+            onSubmit = { _, _, _, _, _ -> },
             userInfo = UserInfo("Test user", "test.user@automattic.com", null),
             attachmentActionsListener = object : AttachmentActionsListener {
                 override fun onAddImageClick() {

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

@@ -183,6 +183,7 @@ class HESupportActivity : AppCompatActivity() {
                             onSendMessage = { message, includeAppLogs ->
                                 viewModel.onAddMessageToConversation(
                                     message = message,
+                                    includeAppLogs = includeAppLogs,
                                 )
                             },
                             onClearMessageSendResult = { viewModel.clearMessageSendResult() },
@@ -221,11 +222,12 @@ class HESupportActivity : AppCompatActivity() {
                     HENewTicketScreen(
                         snackbarHostState = snackbarHostState,
                         onBackClick = { viewModel.onBackClick() },
-                        onSubmit = { category, subject, messageText, siteAddress ->
+                        onSubmit = { category, subject, messageText, siteAddress, includeAppLogs ->
                             viewModel.onSendNewConversation(
                                 subject = subject,
                                 message = messageText,
                                 tags = listOf(category.key),
+                                includeAppLogs = includeAppLogs,
                             )
                         },
                         userInfo = userInfo,