Provide explicit threadId when showing unblock confirmation dialog

This commit is contained in:
Moez Bhatti
2018-08-07 17:32:09 -04:00
parent 374f119792
commit 90e1331885
3 changed files with 6 additions and 7 deletions
@@ -39,7 +39,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView {
override val siaClickedIntent by lazy { shouldIAnswer.clicks() } override val siaClickedIntent by lazy { shouldIAnswer.clicks() }
override val unblockIntent by lazy { blockedAdapter.unblock } override val unblockIntent by lazy { blockedAdapter.unblock }
override val confirmUnblockIntent: Subject<Unit> = PublishSubject.create() override val confirmUnblockIntent: Subject<Long> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockedViewModel::class.java] } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockedViewModel::class.java] }
@@ -61,11 +61,11 @@ class BlockedActivity : QkThemedActivity(), BlockedView {
blockedAdapter.updateData(state.data) blockedAdapter.updateData(state.data)
} }
override fun showUnblockDialog() { override fun showUnblockDialog(threadId: Long) {
AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.blocked_unblock_dialog_title) .setTitle(R.string.blocked_unblock_dialog_title)
.setMessage(R.string.blocked_unblock_dialog_message) .setMessage(R.string.blocked_unblock_dialog_message)
.setPositiveButton(R.string.button_unblock) { _, _ -> confirmUnblockIntent.onNext(Unit) } .setPositiveButton(R.string.button_unblock) { _, _ -> confirmUnblockIntent.onNext(threadId) }
.setNegativeButton(R.string.button_cancel, null) .setNegativeButton(R.string.button_cancel, null)
.show() .show()
} }
@@ -25,8 +25,8 @@ interface BlockedView : QkView<BlockedState> {
val siaClickedIntent: Observable<*> val siaClickedIntent: Observable<*>
val unblockIntent: Observable<Long> val unblockIntent: Observable<Long>
val confirmUnblockIntent: Observable<*> val confirmUnblockIntent: Observable<Long>
fun showUnblockDialog() fun showUnblockDialog(threadId: Long)
} }
@@ -68,11 +68,10 @@ class BlockedViewModel @Inject constructor(
// Show confirm unblock conversation dialog // Show confirm unblock conversation dialog
view.unblockIntent view.unblockIntent
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { view.showUnblockDialog() } .subscribe { threadId -> view.showUnblockDialog(threadId) }
// Unblock conversation // Unblock conversation
view.confirmUnblockIntent view.confirmUnblockIntent
.withLatestFrom(view.unblockIntent) { _, threadId -> threadId }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { threadId -> markUnblocked.execute(listOf(threadId)) } .subscribe { threadId -> markUnblocked.execute(listOf(threadId)) }
} }