diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 87ae0133..c85dfdb5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -284,10 +284,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView { startActivityForResult(Intent.createChooser(intent, null), ATTACH_CONTACT_REQUEST_CODE) } - override fun showContacts(chips: List) { + override fun showContacts(sharing: Boolean, chips: List) { message.hideKeyboard() val serialized = HashMap(chips.associate { chip -> chip.address to chip.contact?.lookupKey }) val intent = Intent(this, ContactsActivity::class.java) + .putExtra(ContactsActivity.SharingKey, sharing) .putExtra(ContactsActivity.ChipsKey, serialized) startActivityForResult(intent, SELECT_CONTACT_REQUEST_CODE) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index 1f7efef6..f4adc28b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -61,7 +61,7 @@ interface ComposeView : QkView { fun requestDefaultSms() fun requestStoragePermission() fun requestSmsPermission() - fun showContacts(chips: List) + fun showContacts(sharing: Boolean, chips: List) fun showKeyboard() fun requestCamera() fun requestGallery() 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 984d94f7..61181d2f 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 @@ -224,9 +224,10 @@ class ComposeViewModel @Inject constructor( override fun bindView(view: ComposeView) { super.bindView(view) + val sharing = sharedText.isNotEmpty() || sharedAttachments.isNotEmpty() if (shouldShowContacts) { shouldShowContacts = false - view.showContacts(selectedChips.blockingFirst()) + view.showContacts(sharing, selectedChips.blockingFirst()) } view.chipsSelectedIntent @@ -257,7 +258,7 @@ class ComposeViewModel @Inject constructor( view.optionsItemIntent .filter { it == R.id.add } .withLatestFrom(selectedChips) { _, chips -> - view.showContacts(chips) + view.showContacts(sharing, chips) } .autoDisposable(view.scope()) .subscribe() @@ -269,7 +270,7 @@ class ComposeViewModel @Inject constructor( chipsReducer.onNext { contacts -> val result = contacts.filterNot { it == contact } if (result.isEmpty()) { - view.showContacts(result) + view.showContacts(sharing, result) } result } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index c0680d7e..5b5863d8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt @@ -47,6 +47,7 @@ import javax.inject.Inject class ContactsActivity : QkThemedActivity(), ContactsContract { companion object { + const val SharingKey = "sharing" const val ChipsKey = "chips" } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt index d8b832f8..a2d21b33 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt @@ -27,6 +27,11 @@ import dagger.multibindings.IntoMap @Module class ContactsActivityModule { + @Provides + fun provideIsSharing(activity: ContactsActivity): Boolean { + return activity.intent.extras?.getBoolean(ContactsActivity.SharingKey, false) ?: false + } + @Provides fun provideChips(activity: ContactsActivity): HashMap { return activity.intent.extras?.getSerializable(ContactsActivity.ChipsKey) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt index 39ad99af..f5869ff1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt @@ -48,6 +48,7 @@ import kotlinx.coroutines.rx2.awaitFirst import javax.inject.Inject class ContactsViewModel @Inject constructor( + sharing: Boolean, serializedChips: HashMap, syncContacts: ContactSync, private val contactFilter: ContactFilter, @@ -60,7 +61,9 @@ class ContactsViewModel @Inject constructor( private val contactGroups: Observable> by lazy { contactsRepo.getUnmanagedContactGroups() } private val contacts: Observable> by lazy { contactsRepo.getUnmanagedContacts() } - private val recents: Observable> by lazy { conversationRepo.getUnmanagedConversations() } + private val recents: Observable> by lazy { + if (sharing) conversationRepo.getUnmanagedConversations() else Observable.just(listOf()) + } private val starredContacts: Observable> by lazy { contactsRepo.getUnmanagedContacts(true) } private val selectedChips = Observable.just(serializedChips)