Merge branch 'master' into scheduled-messages-click-doesnt-schedule-18

# Conflicts:
#	presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
This commit is contained in:
gavine99
2025-02-01 21:24:10 +11:00
2 changed files with 6 additions and 5 deletions
@@ -95,13 +95,13 @@ class Navigator @Inject constructor(
}
}
fun showCompose(body: String? = null, images: List<Uri>? = null, mode: String? = null) {
fun showCompose(body: String? = null, attachments: List<Uri>? = null, mode: String? = null) {
val intent = Intent(context, ComposeActivity::class.java)
intent.putExtra(Intent.EXTRA_TEXT, body)
intent.putExtra("mode", mode)
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)
@@ -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
@@ -383,8 +384,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())