From 89bcf84ab61f7ce9e146582c39ad84a3bfcad3a9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 28 Nov 2017 19:22:08 -0500 Subject: [PATCH] Fix potential memory leak from chip selection/deselection --- .../presentation/compose/ComposeViewModel.kt | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) 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 ce26447b..92b59461 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 @@ -21,6 +21,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject import javax.inject.Inject class ComposeViewModel(threadId: Long) : QkViewModel(ComposeState(editingMode = threadId == 0L)) { @@ -32,13 +34,20 @@ class ComposeViewModel(threadId: Long) : QkViewModel( @Inject lateinit var markRead: MarkRead @Inject lateinit var deleteMessage: DeleteMessage + private val contactsReducer: Subject<(List) -> List> = PublishSubject.create() + private val contacts: List + private val selectedContacts: Observable> private val conversation: Observable init { AppComponentManager.appComponent.inject(this) + selectedContacts = contactsReducer + .scan(listOf(), { previousState, reducer -> reducer(previousState) }) + .doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } } + conversation = messageRepo.getConversationAsync(threadId) .asObservable() .filter { conversation -> conversation.isLoaded } @@ -49,6 +58,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel( disposables += sendMessage disposables += markRead disposables += conversation.subscribe() + disposables += selectedContacts.subscribe() // When the conversation changes, update the messages for the adapter // When the message list changes, make sure to mark them read @@ -80,16 +90,13 @@ class ComposeViewModel(threadId: Long) : QkViewModel( .observeOn(AndroidSchedulers.mainThread()) .subscribe { contacts -> newState { it.copy(contacts = contacts) } } - intents += Observable.merge<(List) -> List>( - view.chipDeletedIntent.map { contact -> - { contacts: List -> contacts.filterNot { it == contact } } - }, - view.chipSelectedIntent.map { contact -> - { contacts: List -> contacts.toMutableList().apply { add(contact) } } - }) - .scan(state.value!!.contacts, { previousState, reducer -> reducer(previousState) }) - .doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } } - .subscribe() + intents += view.chipDeletedIntent.subscribe { contact -> + contactsReducer.onNext { contacts -> contacts.filterNot { it == contact } } + } + + intents += view.chipSelectedIntent.subscribe { contact -> + contactsReducer.onNext { contacts -> contacts.toMutableList().apply { add(contact) } } + } intents += view.textChangedIntent.subscribe { text -> newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }