diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt index 4b2a47cd..1edb301b 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt @@ -26,8 +26,6 @@ import javax.inject.Inject class DeduplicateMessages @Inject constructor( private val messageRepo: MessageRepository ) : Interactor() { - override fun buildObservable(params: Unit): Flowable = - messageRepo.deduplicateMessages() - .subscribeOn(Schedulers.io()) + messageRepo.deduplicateMessages().subscribeOn(Schedulers.io()) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt index 674cd5d4..b7304e83 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.kt @@ -47,4 +47,4 @@ class MessageUtilsActivity : QkThemedActivity() { super.onBackPressed() } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt index d25f9944..be2125be 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt @@ -113,7 +113,7 @@ class MessageUtilsController : QkController when (result) { is MessageRepository.DeduplicationResult.Success -> { - view.handleResult(R.string.deduplicating_messages_finished) + view.handleDeduplicationResult(R.string.deduplicating_messages_finished) } is MessageRepository.DeduplicationResult.NoDuplicates -> { - view.handleResult(R.string.deduplicating_messages_no_messages) + view.handleDeduplicationResult(R.string.deduplicating_messages_no_messages) } is MessageRepository.DeduplicationResult.Failure -> { - view.handleResult(R.string.deduplicating_messages_failed) - Timber.e("Error: ${result.error.localizedMessage}") + view.handleDeduplicationResult(R.string.deduplicating_messages_failed) + Timber.e("Error while deduplicating messages: ${result.error}") } } } @@ -102,4 +102,4 @@ class MessageUtilsPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe() } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt index addc4be2..a2801e70 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt @@ -10,9 +10,9 @@ interface MessageUtilsView: QkViewContract { val autoDeleteClickIntent: Observable fun showDeduplicationConfirmationDialog(): Single - fun handleResult(resIdString: Int) + fun handleDeduplicationResult(resIdString: Int) fun autoDeleteChanged(): Observable fun showAutoDeleteDialog(days: Int) suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean -} \ No newline at end of file +} diff --git a/presentation/src/main/res/layout/message_utils_controller.xml b/presentation/src/main/res/layout/message_utils_controller.xml index 6bdd8a7e..f8f6f542 100644 --- a/presentation/src/main/res/layout/message_utils_controller.xml +++ b/presentation/src/main/res/layout/message_utils_controller.xml @@ -87,4 +87,4 @@ - \ No newline at end of file +