Fix chat files saving issue

Author: ismartcoding

app/src/main/java/com/ismartcoding/plain/chat/PeerFileDownloader.kt

@@ -8,6 +8,7 @@ import com.ismartcoding.plain.db.ChatItemDataUpdate
 import com.ismartcoding.plain.db.DMessageFiles
 import com.ismartcoding.plain.db.DMessageImages
 import com.ismartcoding.plain.helpers.ChatFileSaveHelper
+import com.ismartcoding.plain.preferences.ChatFilesSaveFolderPreference
 import kotlinx.coroutines.flow.MutableStateFlow
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -51,7 +52,8 @@ object PeerFileDownloader {
             task.status = DownloadStatus.DOWNLOADING
             task.downloadedSize = 0
 
-            val chatFilePath = ChatFileSaveHelper.generateChatFilePathAsync(context, fileName)
+            val customDir = ChatFilesSaveFolderPreference.getAsync(context)
+            val chatFilePath = ChatFileSaveHelper.generateChatFilePathAsync(context, fileName, customDir)
             val localFile = File(chatFilePath.path).apply {
                 parentFile?.mkdirs()
                 createNewFile()

app/src/main/java/com/ismartcoding/plain/events/HttpApiEvents.kt

@@ -6,7 +6,7 @@ import com.ismartcoding.plain.db.DChat
 
 // The events sent from the HTTP API
 class HttpApiEvents {
-    class MessageCreatedEvent(val items: List<DChat>) : ChannelEvent()
+    class MessageCreatedEvent(val fromId: String, val items: List<DChat>) : ChannelEvent()
 
     class MessageUpdatedEvent(val id: String) : ChannelEvent()
 

app/src/main/java/com/ismartcoding/plain/helpers/ChatFileSaveHelper.kt

@@ -21,6 +21,7 @@ object ChatFileSaveHelper {
     suspend fun generateChatFilePathAsync(
         context: Context,
         fileName: String,
+        customDir: String,
         pickFileType: PickFileType? = null
     ): ChatFilePath {
         var actualFileName = fileName
@@ -29,7 +30,6 @@ object ChatFileSaveHelper {
             actualFileName = "$actualFileName.jpg"
         }
 
-        val customDir = ChatFilesSaveFolderPreference.getAsync(context)
         val targetDir =  if (customDir.isEmpty()) {
             context.getExternalFilesDir(null)!!
         } else {

app/src/main/java/com/ismartcoding/plain/ui/page/chat/ChatPage.kt

@@ -52,11 +52,13 @@ import com.ismartcoding.plain.events.DeleteChatItemViewEvent
 import com.ismartcoding.plain.events.HttpApiEvents
 import com.ismartcoding.plain.events.PickFileResultEvent
 import com.ismartcoding.plain.extensions.getDuration
+import com.ismartcoding.plain.features.file.FileSystemHelper
 import com.ismartcoding.plain.features.locale.LocaleHelper
 import com.ismartcoding.plain.helpers.ChatFileSaveHelper
 import com.ismartcoding.plain.helpers.FileHelper
 import com.ismartcoding.plain.helpers.ImageHelper
 import com.ismartcoding.plain.helpers.VideoHelper
+import com.ismartcoding.plain.preferences.ChatFilesSaveFolderPreference
 import com.ismartcoding.plain.preferences.ChatInputTextPreference
 import com.ismartcoding.plain.ui.base.AnimatedBottomAction
 import com.ismartcoding.plain.ui.base.HorizontalSpace
@@ -139,9 +141,11 @@ fun ChatPage(
                 }
 
                 is HttpApiEvents.MessageCreatedEvent -> {
-                    chatVM.addAll(event.items)
-                    scope.launch {
-                        scrollState.scrollToItem(0)
+                    if (chatVM.chatState.value.toId == event.fromId) {
+                        chatVM.addAll(event.items)
+                        scope.launch {
+                            scrollState.scrollToItem(0)
+                        }
                     }
                 }
 
@@ -302,13 +306,12 @@ private fun handleFileSelection(
                             }
                         }
                         val size = file.size
-                        
-                        // Generate chat file save path
-                        val chatFilePath = ChatFileSaveHelper.generateChatFilePathAsync(context, fileName, event.type)
-                        
+
+                        val chatFilePath = ChatFileSaveHelper.generateChatFilePathAsync(context, fileName, "", event.type)
+
                         // Copy file to destination
                         FileHelper.copyFile(context, uri, chatFilePath.path)
-                        
+
                         val dstFile = File(chatFilePath.path)
                         val intrinsicSize = if (chatFilePath.path.isImageFast()) ImageHelper.getIntrinsicSize(
                             chatFilePath.path,

app/src/main/java/com/ismartcoding/plain/ui/page/chat/components/ChatFiles.kt

@@ -38,6 +38,7 @@ import androidx.core.net.toUri
 import androidx.navigation.NavHostController
 import coil3.compose.AsyncImage
 import com.ismartcoding.lib.extensions.dp2px
+import com.ismartcoding.lib.extensions.formatBytes
 import com.ismartcoding.lib.extensions.formatDuration
 import com.ismartcoding.lib.extensions.getFilenameExtension
 import com.ismartcoding.lib.extensions.getFilenameFromPath
@@ -71,6 +72,7 @@ import com.ismartcoding.plain.ui.nav.navigatePdf
 import com.ismartcoding.plain.ui.nav.navigateTextFile
 import com.ismartcoding.plain.ui.page.audio.AudioPlayerPage
 import com.ismartcoding.plain.ui.theme.cardBackgroundNormal
+import com.ismartcoding.plain.ui.theme.listItemSubtitle
 import com.ismartcoding.plain.ui.theme.listItemTitle
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -199,6 +201,15 @@ fun ChatFiles(
                                 color = if (isCurrentlyPlaying) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface
                             )
 
+                            Text(
+                                modifier =
+                                    Modifier
+                                        .fillMaxWidth()
+                                        .padding(end = 8.dp),
+                                text = item.size.formatBytes() + if (item.duration > 0) " / ${item.duration.formatDuration()}" else "",
+                                style = MaterialTheme.typography.listItemSubtitle(),
+                            )
+
                             // Display summary for text files if available
                             if (fileName.isTextFile() && item.summary.isNotEmpty()) {
                                 Text(

app/src/main/java/com/ismartcoding/plain/web/MainGraphQL.kt

@@ -730,7 +730,7 @@ class MainGraphQL(val schema: Schema) {
                         if (item.content.type == DMessageType.TEXT.value) {
                             sendEvent(FetchLinkPreviewsEvent(item))
                         }
-                        sendEvent(HttpApiEvents.MessageCreatedEvent(arrayListOf(item)))
+                        sendEvent(HttpApiEvents.MessageCreatedEvent("local", arrayListOf(item)))
                         arrayListOf(item).map { it.toModel() }
                     }
                 }

app/src/main/java/com/ismartcoding/plain/web/PeerGraphQL.kt

@@ -90,7 +90,7 @@ class PeerGraphQL(val schema: Schema) {
                             }
                         }
 
-                        sendEvent(HttpApiEvents.MessageCreatedEvent(arrayListOf(item)))
+                        sendEvent(HttpApiEvents.MessageCreatedEvent(fromId, arrayListOf(item)))
                         arrayListOf(item).map { it.toModel() }
                     }
                 }