Clean up messageUtils code

This commit is contained in:
Inhishonor
2026-01-15 19:45:44 -08:00
parent 50abd37824
commit 8ac0daadc4
6 changed files with 11 additions and 13 deletions
@@ -26,8 +26,6 @@ import javax.inject.Inject
class DeduplicateMessages @Inject constructor( class DeduplicateMessages @Inject constructor(
private val messageRepo: MessageRepository private val messageRepo: MessageRepository
) : Interactor<Unit>() { ) : Interactor<Unit>() {
override fun buildObservable(params: Unit): Flowable<MessageRepository.DeduplicationResult> = override fun buildObservable(params: Unit): Flowable<MessageRepository.DeduplicationResult> =
messageRepo.deduplicateMessages() messageRepo.deduplicateMessages().subscribeOn(Schedulers.io())
.subscribeOn(Schedulers.io())
} }
@@ -47,4 +47,4 @@ class MessageUtilsActivity : QkThemedActivity() {
super.onBackPressed() super.onBackPressed()
} }
} }
} }
@@ -113,7 +113,7 @@ class MessageUtilsController : QkController<MessageUtilsView, MessageUtilsState,
.show() .show()
} }
override fun handleResult(resIdString: Int) { override fun handleDeduplicationResult(resIdString: Int) {
binding?.deduplicationProgressText?.isVisible = true binding?.deduplicationProgressText?.isVisible = true
binding?.deduplicationProgressText?.setText(resIdString) binding?.deduplicationProgressText?.setText(resIdString)
} }
@@ -52,16 +52,16 @@ class MessageUtilsPresenter @Inject constructor(
.subscribe { result -> .subscribe { result ->
when (result) { when (result) {
is MessageRepository.DeduplicationResult.Success -> { is MessageRepository.DeduplicationResult.Success -> {
view.handleResult(R.string.deduplicating_messages_finished) view.handleDeduplicationResult(R.string.deduplicating_messages_finished)
} }
is MessageRepository.DeduplicationResult.NoDuplicates -> { is MessageRepository.DeduplicationResult.NoDuplicates -> {
view.handleResult(R.string.deduplicating_messages_no_messages) view.handleDeduplicationResult(R.string.deduplicating_messages_no_messages)
} }
is MessageRepository.DeduplicationResult.Failure -> { is MessageRepository.DeduplicationResult.Failure -> {
view.handleResult(R.string.deduplicating_messages_failed) view.handleDeduplicationResult(R.string.deduplicating_messages_failed)
Timber.e("Error: ${result.error.localizedMessage}") Timber.e("Error while deduplicating messages: ${result.error}")
} }
} }
} }
@@ -102,4 +102,4 @@ class MessageUtilsPresenter @Inject constructor(
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe() .subscribe()
} }
} }
@@ -10,9 +10,9 @@ interface MessageUtilsView: QkViewContract<MessageUtilsState> {
val autoDeleteClickIntent: Observable<Unit> val autoDeleteClickIntent: Observable<Unit>
fun showDeduplicationConfirmationDialog(): Single<Boolean> fun showDeduplicationConfirmationDialog(): Single<Boolean>
fun handleResult(resIdString: Int) fun handleDeduplicationResult(resIdString: Int)
fun autoDeleteChanged(): Observable<Int> fun autoDeleteChanged(): Observable<Int>
fun showAutoDeleteDialog(days: Int) fun showAutoDeleteDialog(days: Int)
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
} }
@@ -87,4 +87,4 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>