Merge pull request #247 from gavine99/forward-all-attachments

fix only images attached to forwarded messages
octoshrimpy · Jan 30, 2025 · ade3ccb · ade3ccb
2 parents 5270006 + b0f6491
commit ade3ccb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
@@ -95,12 +95,12 @@ class Navigator @Inject constructor(
         }
     }
 
-    fun showCompose(body: String? = null, images: List<Uri>? = null) {
+    fun showCompose(body: String? = null, attachments: List<Uri>? = null) {
         val intent = Intent(context, ComposeActivity::class.java)
         intent.putExtra(Intent.EXTRA_TEXT, body)
 
-        images?.takeIf { it.isNotEmpty() }?.let {
-            intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(images))
+        attachments?.takeIf { it.isNotEmpty() }?.let {
+            intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(attachments))
         }
 
         startActivity(intent)

diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
@@ -59,6 +59,7 @@ import dev.octoshrimpy.quik.util.Preferences
 import dev.octoshrimpy.quik.util.tryOrNull
 import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.autoDisposable
+import dev.octoshrimpy.quik.extensions.isSmil
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.Observables
@@ -378,8 +379,8 @@ class ComposeViewModel @Inject constructor(
             .filter { it == R.id.forward }
             .withLatestFrom(view.messagesSelectedIntent) { _, messages ->
                 messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message ->
-                    val images = message.parts.filter { it.isImage() }.mapNotNull { it.getUri() }
-                    navigator.showCompose(message.getText(), images)
+                    val attachments = message.parts.filter { !it.isSmil() }.mapNotNull { it.getUri() }
+                    navigator.showCompose(message.getText(), attachments)
                 }
             }
             .autoDisposable(view.scope())