#1236 - Allow selecting if you want to drop or save blocked messages

This commit is contained in:
moezbhatti
2019-06-04 00:14:53 -04:00
parent 14bf7d4271
commit 25aff4d7ca
10 changed files with 67 additions and 13 deletions
@@ -39,6 +39,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView {
override val ccClickedIntent by lazy { callControl.clicks() }
override val siaClickedIntent by lazy { shouldIAnswer.clicks() }
override val dropClickedIntent by lazy { drop.clicks() }
override val unblockIntent by lazy { blockedAdapter.unblock }
override val confirmUnblockIntent: Subject<Long> = PublishSubject.create()
@@ -59,6 +60,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView {
override fun render(state: BlockedState) {
callControl.checkbox.isChecked = state.ccEnabled
shouldIAnswer.checkbox.isChecked = state.siaEnabled
drop.checkbox.isChecked = state.dropEnabled
blockedAdapter.updateData(state.data)
}
@@ -24,5 +24,6 @@ import io.realm.RealmResults
data class BlockedState(
val ccEnabled: Boolean = false,
val siaEnabled: Boolean = false,
val dropEnabled: Boolean = false,
val data: RealmResults<Conversation>? = null
)
@@ -25,6 +25,7 @@ interface BlockedView : QkView<BlockedState> {
val ccClickedIntent: Observable<*>
val siaClickedIntent: Observable<*>
val dropClickedIntent: Observable<*>
val unblockIntent: Observable<Long>
val confirmUnblockIntent: Observable<Long>
@@ -48,6 +48,9 @@ class BlockedViewModel @Inject constructor(
disposables += prefs.sia.asObservable()
.subscribe { enabled -> newState { copy(siaEnabled = enabled) } }
disposables += prefs.drop.asObservable()
.subscribe { enabled -> newState { copy(dropEnabled = enabled) } }
}
override fun bindView(view: BlockedView) {
@@ -86,6 +89,10 @@ class BlockedViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe(prefs.sia::set)
view.dropClickedIntent
.autoDisposable(view.scope())
.subscribe { prefs.drop.set(!prefs.drop.get()) }
// Show confirm unblock conversation dialog
view.unblockIntent
.autoDisposable(view.scope())