From 90e1331885d3d002e476d15148a6ccbf81c92c3b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 7 Aug 2018 17:32:09 -0400 Subject: [PATCH] Provide explicit threadId when showing unblock confirmation dialog --- .../java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt | 6 +++--- .../main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt | 4 ++-- .../java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt index e696e1ea..df536113 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt @@ -39,7 +39,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView { override val siaClickedIntent by lazy { shouldIAnswer.clicks() } override val unblockIntent by lazy { blockedAdapter.unblock } - override val confirmUnblockIntent: Subject = PublishSubject.create() + override val confirmUnblockIntent: Subject = PublishSubject.create() private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockedViewModel::class.java] } @@ -61,11 +61,11 @@ class BlockedActivity : QkThemedActivity(), BlockedView { blockedAdapter.updateData(state.data) } - override fun showUnblockDialog() { + override fun showUnblockDialog(threadId: Long) { AlertDialog.Builder(this) .setTitle(R.string.blocked_unblock_dialog_title) .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) .show() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt index cf514bd3..3b5d5216 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt @@ -25,8 +25,8 @@ interface BlockedView : QkView { val siaClickedIntent: Observable<*> val unblockIntent: Observable - val confirmUnblockIntent: Observable<*> + val confirmUnblockIntent: Observable - fun showUnblockDialog() + fun showUnblockDialog(threadId: Long) } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt index cdc02932..e50540bd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt @@ -68,11 +68,10 @@ class BlockedViewModel @Inject constructor( // Show confirm unblock conversation dialog view.unblockIntent .autoDisposable(view.scope()) - .subscribe { view.showUnblockDialog() } + .subscribe { threadId -> view.showUnblockDialog(threadId) } // Unblock conversation view.confirmUnblockIntent - .withLatestFrom(view.unblockIntent) { _, threadId -> threadId } .autoDisposable(view.scope()) .subscribe { threadId -> markUnblocked.execute(listOf(threadId)) } }