CMM-886 logs sharing fix and send to he ticket

WordPress/src/main/java/org/wordpress/android/support/he/repository/HESupportRepository.kt

@@ -97,7 +97,8 @@ class HESupportRepository @Inject constructor(
         subject: String,
         message: String,
         tags: List<String>,
-        attachments: List<String>
+        attachments: List<String>,
+        encryptedLogIds: List<String>,
     ): CreateConversationResult = withContext(ioDispatcher) {
         val response = wpComApiClient.request { requestBuilder ->
             requestBuilder.supportTickets().createSupportTicket(
@@ -106,6 +107,7 @@ class HESupportRepository @Inject constructor(
                     message = message,
                     tags = tags,
                     attachments = attachments,
+                    encryptedLogIds = encryptedLogIds,
                     application = APPLICATION_ID, // Only jetpack is supported
                 )
             )
@@ -138,7 +140,7 @@ class HESupportRepository @Inject constructor(
     suspend fun addMessageToConversation(
         conversationId: Long,
         message: String,
-        attachments: List<String>
+        attachments: List<String>,
     ): CreateConversationResult = withContext(ioDispatcher) {
         val response = wpComApiClient.request { requestBuilder ->
             requestBuilder.supportTickets().addMessageToSupportConversation(

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

@@ -70,6 +70,7 @@ fun HENewTicketScreen(
         subject: String,
         messageText: String,
         siteAddress: String,
+        includeAppLogs: Boolean,
             ) -> Unit,
     userInfo: UserInfo,
     isSendingNewConversation: Boolean = false,
@@ -110,8 +111,9 @@ private fun HENewTicketScreenContent(
     onSubmit: (
         category: SupportCategory,
         subject: String,
-        messageText: String,
+        message: String,
         siteAddress: String,
+        includeAppLogs: Boolean,
             ) -> Unit,
     userInfo: UserInfo,
     isSendingNewConversation: Boolean,
@@ -143,7 +145,7 @@ private fun HENewTicketScreenContent(
                 isLoading = isSendingNewConversation,
                 onClick = {
                     selectedCategory?.let { category ->
-                        onSubmit(category, subject, messageText, siteAddress)
+                        onSubmit(category, subject, messageText, siteAddress, includeAppLogs)
                     }
                 }
             )
@@ -465,7 +467,7 @@ private fun HENewTicketScreenPreviewContent(snackbarHostState: SnackbarHostState
     HENewTicketScreenContent(
         snackbarHostState = snackbarHostState,
         onBackClick = { },
-        onSubmit = { _, _, _, _ -> },
+        onSubmit = { _, _, _, _, _ -> },
         userInfo = UserInfo("Test user", "[email protected]", null),
         isSendingNewConversation = false,
         attachmentState = AttachmentState(),

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

@@ -189,9 +189,10 @@
                                 viewModel.clearReplyForm()
                                 viewModel.onBackClick()
                             },
-                            onSendMessage = { message, _ ->
+                            onSendMessage = { message, includeAppLogs ->
                                 viewModel.onAddMessageToConversation(
                                     message = message,
+                                    includeAppLogs = includeAppLogs,
                                 )
                             },
                             onClearMessageSendResult = { viewModel.clearMessageSendResult() },
@@ -240,11 +241,12 @@
                             viewModel.clearNewTicketForm()
                             viewModel.onBackClick()
                         },
-                        onSubmit = { category, subject, message, _ ->
+                        onSubmit = { category, subject, message, siteAddress, includeAppLogs ->
                             viewModel.onSendNewConversation(
                                 subject = subject,
                                 message = message,
                                 tags = listOf(category.key),
+                                includeAppLogs = includeAppLogs,
                             )
                         },
                         userInfo = userInfo,

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

@@ -24,6 +24,8 @@ import org.wordpress.android.support.he.repository.CreateConversationResult
 import org.wordpress.android.support.he.repository.HESupportRepository
 import org.wordpress.android.support.he.util.TempAttachmentsUtil
 import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.EncryptedLogging
+import org.wordpress.android.util.LogFileProviderWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
 import java.io.File
 import javax.inject.Inject
@@ -34,6 +36,8 @@ class HESupportViewModel @Inject constructor(
     private val heSupportRepository: HESupportRepository,
     @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
     private val tempAttachmentsUtil: TempAttachmentsUtil,
+    private val encryptedLogging: EncryptedLogging,
+    private val logFileProvider: LogFileProviderWrapper,
     private val application: Application,
     accountStore: AccountStore,
     appLogWrapper: AppLogWrapper,
@@ -76,6 +80,7 @@ class HESupportViewModel @Inject constructor(
         subject: String,
         message: String,
         tags: List<String>,
+        includeAppLogs : Boolean,
     ) {
         viewModelScope.launch(ioDispatcher) {
             try {
@@ -86,14 +91,21 @@ class HESupportViewModel @Inject constructor(
 
                 _isSendingMessage.value = true
 
+                val logsIds: List<String> = if (includeAppLogs) {
+                     uploadLogs()
+                } else {
+                    emptyList()
+                }
+
                 val attachmentUris = _newTicketFormState.value.attachmentState.acceptedUris
-                val files = tempAttachmentsUtil.createTempFilesFrom(attachmentUris)
+                val attachments = tempAttachmentsUtil.createTempFilesFrom(attachmentUris)
 
                 when (val result = heSupportRepository.createConversation(
                     subject = subject,
                     message = message,
                     tags = tags,
-                    attachments = files.map { it.path }
+                    attachments = attachments.map { it.path },
+                    encryptedLogIds = logsIds
                 )) {
                     is CreateConversationResult.Success -> {
                         val newConversation = result.conversation
@@ -115,7 +127,7 @@ class HESupportViewModel @Inject constructor(
                     }
                 }
 
-                tempAttachmentsUtil.removeTempFiles(files)
+                tempAttachmentsUtil.removeTempFiles(attachments)
                 _isSendingMessage.value = false
             } catch (e: Exception) {
                 _errorMessage.value = ErrorType.GENERAL
@@ -127,11 +139,26 @@ class HESupportViewModel @Inject constructor(
         }
     }
 
+    private fun uploadLogs(): List<String> {
+        val encryptedLogsUuid = mutableListOf<String>()
+        logFileProvider.getLogFiles().forEach { logFile ->
+            if (logFile.exists()) {
+                encryptedLogging.encryptAndUploadLogFile(
+                    logFile = logFile,
+                    shouldStartUploadImmediately = true
+                )?.let { uuid ->
+                    encryptedLogsUuid.add(uuid)
+                }
+            }
+        }
+        return encryptedLogsUuid
+    }
+
     override suspend fun getConversation(conversationId: Long): SupportConversation? =
         heSupportRepository.loadConversation(conversationId)
 
     @Suppress("TooGenericExceptionCaught")
-    fun onAddMessageToConversation(message: String) {
+    fun onAddMessageToConversation(message: String, includeAppLogs: Boolean) {
         viewModelScope.launch(ioDispatcher) {
             try {
                 if (!networkUtilsWrapper.isNetworkAvailable()) {
@@ -147,13 +174,18 @@ class HESupportViewModel @Inject constructor(
                 }
 
                 _isSendingMessage.value = true
+
+                if (includeAppLogs) {
+                    // We will add the logs when the RS layer is ready for this
+                }
+
                 val attachmentUris = _replyFormState.value.attachmentState.acceptedUris
-                val files = tempAttachmentsUtil.createTempFilesFrom(attachmentUris)
+                val attachments = tempAttachmentsUtil.createTempFilesFrom(attachmentUris)
 
                 when (val result = heSupportRepository.addMessageToConversation(
                     conversationId = selectedConversation.id,
                     message = message,
-                    attachments = files.map { it.path }
+                    attachments = attachments.map { it.path }
                 )) {
                     is CreateConversationResult.Success -> {
                         _selectedConversation.value = result.conversation
@@ -175,7 +207,7 @@ class HESupportViewModel @Inject constructor(
                     }
                 }
 
-                tempAttachmentsUtil.removeTempFiles(files)
+                tempAttachmentsUtil.removeTempFiles(attachments)
                 _isSendingMessage.value = false
             } catch (e: Exception) {
                 _errorMessage.value = ErrorType.GENERAL

WordPress/src/main/java/org/wordpress/android/support/logs/model/LogFile.kt

@@ -0,0 +1,12 @@
+package org.wordpress.android.support.logs.model
+
+import java.io.File
+
+data class LogFile(
+    val file: File,
+    val fileName: String,
+    val title: String,
+    val subtitle: String,
+    // Log lines could be truncated to avoid memory issues
+    val logLines: List<String>? = null
+)

WordPress/src/main/java/org/wordpress/android/support/logs/ui/LogDetailScreen.kt

@@ -25,24 +25,23 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.text.HtmlCompat
 import org.wordpress.android.R
-import org.wordpress.android.support.logs.model.LogDay
+import org.wordpress.android.support.logs.model.LogFile
 import org.wordpress.android.ui.compose.components.MainTopAppBar
 import org.wordpress.android.ui.compose.components.NavigationIcons
 import org.wordpress.android.ui.compose.theme.AppThemeM3
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LogDetailScreen(
-    logDay: LogDay,
+    logFile: LogFile,
     onBackClick: () -> Unit,
     onShareClick: () -> Unit
 ) {
     Scaffold(
         topBar = {
             MainTopAppBar(
-                title = logDay.displayDate,
+                title = logFile.title,
                 navigationIcon = NavigationIcons.BackIcon,
                 onNavigationIconClick = onBackClick
             )
@@ -77,11 +76,12 @@ fun LogDetailScreen(
                     Spacer(modifier = Modifier.height(16.dp))
                 }
 
+                val logLines = logFile.logLines ?: emptyList()
                 itemsIndexed(
-                    items = logDay.logEntries,
-                    key = { index, _ -> "${logDay.date}_$index" }
-                ) { _, logEntry ->
-                    LogEntryItem(logEntry = logEntry)
+                    items = logLines,
+                    key = { index, _ -> "${logFile.fileName}_$index" }
+                ) { _, logLine ->
+                    LogLineItem(logLine = logLine)
                 }
 
                 item {
@@ -93,19 +93,13 @@ fun LogDetailScreen(
 }
 
 @Composable
-private fun LogEntryItem(logEntry: String) {
+private fun LogLineItem(logLine: String) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
     ) {
-        // Strip HTML tags for display in Compose
-        val plainText = HtmlCompat.fromHtml(
-            logEntry,
-            HtmlCompat.FROM_HTML_MODE_LEGACY
-        ).toString()
-
         Text(
-            text = plainText,
+            text = logLine,
             style = MaterialTheme.typography.bodySmall.copy(
                 fontFamily = FontFamily.Monospace,
                 fontSize = 12.sp,
@@ -119,14 +113,16 @@ private fun LogEntryItem(logEntry: String) {
 @Preview(showBackground = true, name = "Log Detail Screen - Light")
 @Composable
 private fun LogDetailScreenPreview() {
-    val exampleList = getExampleLogList()
+    val exampleLogLines = getExampleLogLines()
+    val mockFile = java.io.File("")
     AppThemeM3(isDarkTheme = false) {
         LogDetailScreen(
-            logDay = LogDay(
-                date = "Oct-16",
-                displayDate = "October 16",
-                logEntries = exampleList,
-                logCount = exampleList.size
+            logFile = LogFile(
+                file = mockFile,
+                fileName = "2025-11-21T10:42:06+0100.log",
+                title = "November 21, 2025",
+                subtitle = "10:42 AM",
+                logLines = exampleLogLines
             ),
             onBackClick = {},
             onShareClick = {}
@@ -137,22 +133,24 @@ private fun LogDetailScreenPreview() {
 @Preview(showBackground = true, name = "Log Detail Screen - Dark", uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
 private fun LogDetailScreenPreviewDark() {
-    val exampleList = getExampleLogList()
+    val exampleLogLines = getExampleLogLines()
+    val mockFile = java.io.File("")
     AppThemeM3(isDarkTheme = true) {
         LogDetailScreen(
-            logDay = LogDay(
-                date = "Oct-16",
-                displayDate = "October 16",
-                logEntries = exampleList,
-                logCount = exampleList.size
+            logFile = LogFile(
+                file = mockFile,
+                fileName = "2025-11-21T10:42:06+0100.log",
+                title = "November 21, 2025",
+                subtitle = "10:42 AM",
+                logLines = exampleLogLines
             ),
             onBackClick = {},
             onShareClick = {}
         )
     }
 }
 
-private fun getExampleLogList(): List<String> = listOf(
+private fun getExampleLogLines(): List<String> = listOf(
     "[Oct-16 12:34:56.789] D/MainActivity: Activity created",
     "[Oct-16 12:34:57.123] I/NetworkManager: Connection established",
     "[Oct-16 12:34:58.456] W/ImageLoader: Cache miss for image_123",