From 8bb835c2f515a31dfb69442fe1dadfacf8f9e153 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 12 Jan 2018 23:35:37 -0500 Subject: [PATCH] Use live-unmanaged list of contacts in ComposeViewModel Fixes #839 --- .../java/data/repository/ContactRepository.kt | 26 +++++++++---------- .../feature/compose/ComposeViewModel.kt | 4 +-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/qksms/src/main/java/data/repository/ContactRepository.kt b/qksms/src/main/java/data/repository/ContactRepository.kt index 0553668b..09512802 100644 --- a/qksms/src/main/java/data/repository/ContactRepository.kt +++ b/qksms/src/main/java/data/repository/ContactRepository.kt @@ -27,6 +27,8 @@ import data.model.Contact import data.model.PhoneNumber import io.reactivex.Flowable import io.reactivex.Single +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers import io.realm.Realm import timber.log.Timber import javax.inject.Inject @@ -44,21 +46,17 @@ class ContactRepository @Inject constructor(val context: Context) { .map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) } } - fun getContacts(): List { + fun getUnmanagedContacts(): Flowable> { val realm = Realm.getDefaultInstance() - val results = realm.copyFromRealm(realm - .where(Contact::class.java) - .findAllSorted("name")) - realm.close() - - return results - } - - fun getContact(address: String): Flowable { - return Flowable.fromPublisher { emitter -> - getContactBlocking(address)?.let { emitter.onNext(it) } - emitter.onComplete() - } + return realm.where(Contact::class.java) + .sort("name") + .findAllAsync() + .asFlowable() + .filter { it.isLoaded } + .filter { it.isValid } + .map { realm.copyFromRealm(it) } + .subscribeOn(AndroidSchedulers.mainThread()) + .observeOn(Schedulers.io()) } fun getContactBlocking(address: String): Contact? { diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 7e75673d..e2d28662 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -67,7 +67,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel( private var draft: String = "" private val attachments: Subject> = BehaviorSubject.createDefault(ArrayList()) - private val contacts: List by lazy { contactsRepo.getContacts() } + private val contacts: Observable> by lazy { contactsRepo.getUnmanagedContacts().toObservable() } private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() private val selectedContacts: Observable> private val conversation: Observable @@ -184,7 +184,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel( // Update the list of contact suggestions based on the query input, while also filtering out any contacts // that have already been selected intents += Observables - .combineLatest(view.queryChangedIntent, selectedContacts, { query, selectedContacts -> + .combineLatest(view.queryChangedIntent, contacts, selectedContacts, { query, contacts, selectedContacts -> contacts .filterNot { contact -> selectedContacts.contains(contact) } .filter { contact -> contactFilter.filter(contact, query) }