From 34378fbc95feca1ee681f97293c4056f12c5eb50 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 4 Jan 2018 03:27:39 -0500 Subject: [PATCH] Launch ComposeActivity directly from other apps, load address from intent --- qksms/src/main/AndroidManifest.xml | 10 +++--- .../java/presentation/common/Navigator.kt | 4 +-- .../feature/compose/ComposeViewModel.kt | 31 ++++++++++++++++--- .../presentation/feature/main/MainActivity.kt | 10 +----- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index b9a96c27..f35e656a 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -27,15 +27,16 @@ + + - - - @@ -44,9 +45,6 @@ - diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index 07b38f40..73db3178 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -105,9 +105,7 @@ class Navigator @Inject constructor(val context: Context) { } ComposeViewModel::class.java -> { - val threadId = intent.getLongExtra("threadId", 0) - val body = intent.getStringExtra("body") ?: "" - ComposeViewModel(threadId, body) + ComposeViewModel(intent) } SettingsViewModel::class.java -> { diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index d47e06c4..0cf61567 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -19,6 +19,7 @@ package presentation.feature.compose import android.content.Context +import android.content.Intent import com.moez.QKSMS.R import common.di.appComponent import common.util.ClipboardUtils @@ -30,8 +31,6 @@ import data.model.Conversation import data.repository.ContactRepository import data.repository.MessageRepository import interactor.* -import presentation.common.Navigator -import presentation.common.base.QkViewModel import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables @@ -40,10 +39,13 @@ import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject +import presentation.common.Navigator +import presentation.common.base.QkViewModel +import timber.log.Timber +import java.net.URLDecoder import javax.inject.Inject -class ComposeViewModel(threadId: Long, var draft: String) - : QkViewModel(ComposeState(editingMode = threadId == 0L)) { +class ComposeViewModel(intent: Intent) : QkViewModel(ComposeState()) { @Inject lateinit var context: Context @Inject lateinit var contactFilter: ContactFilter @@ -58,6 +60,7 @@ class ComposeViewModel(threadId: Long, var draft: String) @Inject lateinit var markRead: MarkRead @Inject lateinit var deleteMessage: DeleteMessage + private var draft: String = "" private val contacts: List by lazy { contactsRepo.getContacts() } private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() private val selectedContacts: Observable> @@ -66,6 +69,24 @@ class ComposeViewModel(threadId: Long, var draft: String) init { appComponent.inject(this) + val threadId = intent.extras?.getLong("threadId") ?: 0L + draft = intent.extras?.getString("draft") ?: "" + + intent.data?.let { + val data = URLDecoder.decode(it.toString(), "utf-8") + val scheme = it.scheme + val address = when { + scheme.startsWith("smsto") -> data.replace("smsto:", "") + scheme.startsWith("mmsto") -> data.replace("mmsto:", "") + scheme.startsWith("sms") -> data.replace("sms:", "") + scheme.startsWith("mms") -> data.replace("mms:", "") + else -> "" + } + Timber.v("address: $address") + } + + newState { ComposeState(editingMode = threadId == 0L) } + selectedContacts = contactsReducer .scan(listOf(), { previousState, reducer -> reducer(previousState) }) .doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } } @@ -213,7 +234,7 @@ class ComposeViewModel(threadId: Long, var draft: String) sendMessage.execute(SendMessage.Params(threadId, address, body)) view.setDraft("") }) - .withLatestFrom(state, {_, state -> + .withLatestFrom(state, { _, state -> if (state.editingMode) { newState { it.copy(editingMode = false) } } diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 94b117d7..237fb8d0 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -19,7 +19,6 @@ package presentation.feature.main import android.app.AlertDialog -import android.content.Intent import android.content.res.ColorStateList import android.graphics.drawable.ColorDrawable import android.graphics.drawable.StateListDrawable @@ -48,8 +47,8 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.main_activity.* import kotlinx.android.synthetic.main.toolbar_search.* -import presentation.common.Navigator import presentation.common.MenuItemAdapter +import presentation.common.Navigator import presentation.common.base.QkActivity import presentation.feature.conversations.ConversationItemTouchCallback import presentation.feature.conversations.ConversationsAdapter @@ -177,13 +176,6 @@ class MainActivity : QkActivity(), MainView { }) } - override fun onNewIntent(intent: Intent?) { - super.onNewIntent(intent) - intent?.getLongExtra("threadId", 0) - ?.takeIf { threadId -> threadId > 0 } - ?.let { threadId -> navigator.showConversation(threadId) } - } - override fun render(state: MainState) { toolbarSearch.isEnabled = state.page is Inbox toolbarSearch.textSize = if (state.page is Inbox) 16f else 20f