diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt index 81e9b93f..bafd4ec7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -22,8 +22,9 @@ class Navigator @Inject constructor(val context: Context) { context.startActivity(intent) } - fun showCompose() { + fun showCompose(body: String? = null) { val intent = Intent(context, ComposeActivity::class.java) + intent.putExtra("body", body) startActivity(intent) } @@ -55,7 +56,8 @@ class Navigator @Inject constructor(val context: Context) { ComposeViewModel::class.java -> { val threadId = intent.getLongExtra("threadId", 0) - ComposeViewModel(threadId) + val body = intent.getStringExtra("body") ?: "" + ComposeViewModel(threadId, body) } SettingsViewModel::class.java -> { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index 1be2a125..316c213c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -24,7 +24,8 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import javax.inject.Inject -class ComposeViewModel(threadId: Long) : QkViewModel(ComposeState(editingMode = threadId == 0L)) { +class ComposeViewModel(threadId: Long, body: String) + : QkViewModel(ComposeState(editingMode = threadId == 0L, draft = body)) { @Inject lateinit var context: Context @Inject lateinit var contactFilter: ContactFilter @@ -182,6 +183,11 @@ class ComposeViewModel(threadId: Long) : QkViewModel( context.makeToast(R.string.toast_copied) } + // Forward the message + intents += view.forwardMessageIntent.subscribe { message -> + navigator.showCompose(message.body) + } + // Delete the selected message intents += view.deleteMessageIntent.subscribe { message -> deleteMessage.execute(message.id)