From 34d535633d56ce79358927de5352e13ea15607b1 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Thu, 30 Jan 2025 06:11:53 +1100 Subject: [PATCH 1/2] fix only images attached to forwarded messages --- .../java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index dbb67eff..b0928282 100644 --- 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()) From b0f64916504cfa05c8ea6bc479ebf37b2c2506d8 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Thu, 30 Jan 2025 06:34:49 +1100 Subject: [PATCH 2/2] attach missed checkin file Navigator.kt - only has a parameter rename --- .../src/main/java/com/moez/QKSMS/common/Navigator.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index 15d1c359..f510cd1d 100644 --- 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? = null) { + fun showCompose(body: String? = null, attachments: List? = 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)