From 50abd3782434883f9458c36d1868d28006a0c282 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Thu, 15 Jan 2026 19:34:32 -0800 Subject: [PATCH] Move auto delete old messages to message management It fits better here and will help cleaning out the settings page --- .../messageutils/MessageUtilsController.kt | 38 +++++++++++++++++ .../messageutils/MessageUtilsPresenter.kt | 42 ++++++++++++++++++- .../feature/messageutils/MessageUtilsState.kt | 4 +- .../feature/messageutils/MessageUtilsView.kt | 5 +++ .../feature/settings/SettingsController.kt | 32 -------------- .../feature/settings/SettingsPresenter.kt | 39 ----------------- .../QKSMS/feature/settings/SettingsState.kt | 1 - .../QKSMS/feature/settings/SettingsView.kt | 3 -- .../res/layout/message_utils_controller.xml | 13 ++++++ .../main/res/layout/settings_controller.xml | 8 ---- 10 files changed, 100 insertions(+), 85 deletions(-) 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 32b275fb..d25f9944 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 @@ -2,6 +2,7 @@ package dev.octoshrimpy.quik.feature.messageutils import android.animation.ObjectAnimator import android.app.AlertDialog +import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -12,15 +13,30 @@ import dev.octoshrimpy.quik.common.base.QkController import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.widget.QkSwitch import dev.octoshrimpy.quik.databinding.MessageUtilsControllerBinding +import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.MessageRepository +import io.reactivex.Observable import io.reactivex.Single +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext import javax.inject.Inject +import kotlin.coroutines.resume + class MessageUtilsController : QkController(), MessageUtilsView { + @Inject lateinit var context: Context @Inject override lateinit var presenter: MessageUtilsPresenter + private val autoDeleteDialog: AutoDeleteDialog by lazy { + AutoDeleteDialog(activity!!, autoDeleteSubject::onNext) + } + private val autoDeleteSubject: Subject = PublishSubject.create() private var binding: MessageUtilsControllerBinding? = null override val autoDeduplicateClickIntent by lazy { binding!!.autoDeduplicate.clicks() } override val deduplicateClickIntent by lazy { binding!!.deduplicateMessages.clicks() } + override val autoDeleteClickIntent by lazy { binding!!.autoDelete.clicks() } init { appComponent.inject(this) @@ -79,6 +95,12 @@ class MessageUtilsController : QkController context.getString(R.string.settings_auto_delete_never) + else -> context.resources.getQuantityString( + R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete) + } } override fun showDeduplicationConfirmationDialog(): Single = Single.create { emitter -> @@ -95,4 +117,20 @@ class MessageUtilsController : QkController = autoDeleteSubject + + override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show() + + override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) { + suspendCancellableCoroutine { cont -> + androidx.appcompat.app.AlertDialog.Builder(activity!!) + .setTitle(R.string.settings_auto_delete_warning) + .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages)) + .setOnCancelListener { cont.resume(false) } + .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) } + .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) } + .show() + } + } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt index 97662b63..3deeffeb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt @@ -1,23 +1,29 @@ package dev.octoshrimpy.quik.feature.messageutils +import android.content.Context import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.interactor.DeduplicateMessages +import dev.octoshrimpy.quik.interactor.DeleteOldMessages import dev.octoshrimpy.quik.repository.MessageRepository +import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.Preferences import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers +import kotlinx.coroutines.runBlocking import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject class MessageUtilsPresenter @Inject constructor( + private val context: Context, private val deduplicateMessages: DeduplicateMessages, private val prefs: Preferences, - messageRepo: MessageRepository + private val deleteOldMessages: DeleteOldMessages, + private val messageRepo: MessageRepository ) : QkPresenter(MessageUtilsState()) { init { disposables += messageRepo.deduplicationProgress @@ -27,6 +33,9 @@ class MessageUtilsPresenter @Inject constructor( disposables += prefs.autoDeduplicate.asObservable() .subscribe { enabled -> newState { copy(autoDeduplicateMessages = enabled) } } + + disposables += prefs.autoDelete.asObservable() + .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } } } override fun bindIntents(view: MessageUtilsView) { @@ -61,5 +70,36 @@ class MessageUtilsPresenter @Inject constructor( view.autoDeduplicateClickIntent .autoDisposable(view.scope()) .subscribe { prefs.autoDeduplicate.set(!prefs.autoDeduplicate.get()) } + + view.autoDeleteClickIntent + .autoDisposable(view.scope()) + .subscribe { view.showAutoDeleteDialog(prefs.autoDelete.get()) } + + view.autoDeleteChanged() + .observeOn(Schedulers.io()) + .filter { maxAge -> + if (maxAge == 0) { + return@filter true + } + + val counts = messageRepo.getOldMessageCounts(maxAge) + if (counts.values.sum() == 0) { + return@filter true + } + + runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } + } + .doOnNext { maxAge -> + when (maxAge == 0) { + true -> AutoDeleteService.cancelJob(context) + false -> { + AutoDeleteService.scheduleJob(context) + deleteOldMessages.execute(Unit) + } + } + } + .doOnNext(prefs.autoDelete::set) + .autoDisposable(view.scope()) + .subscribe() } } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt index e09528cb..cadd9d23 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt @@ -4,5 +4,7 @@ import dev.octoshrimpy.quik.repository.MessageRepository data class MessageUtilsState( val autoDeduplicateMessages: Boolean = false, - val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle + val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle, + + val autoDelete: Int = 0, ) 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 b7919308..addc4be2 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 @@ -7,7 +7,12 @@ import io.reactivex.Single interface MessageUtilsView: QkViewContract { val autoDeduplicateClickIntent: Observable<*> val deduplicateClickIntent: Observable + val autoDeleteClickIntent: Observable fun showDeduplicationConfirmationDialog(): Single fun handleResult(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/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index d2b5bf9d..67786d0e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -24,7 +24,6 @@ import android.content.Context import android.os.Build import android.text.format.DateFormat import android.view.View -import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import com.bluelinelabs.conductor.RouterTransaction import com.google.android.material.snackbar.Snackbar @@ -45,7 +44,6 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView import dev.octoshrimpy.quik.common.widget.TextInputDialog import dev.octoshrimpy.quik.feature.settings.about.AboutController -import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog import dev.octoshrimpy.quik.feature.settings.swipe.SwipeActionsController import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent @@ -58,11 +56,7 @@ import kotlinx.android.synthetic.main.settings_controller.* import kotlinx.android.synthetic.main.settings_controller.view.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* import kotlinx.android.synthetic.main.settings_theme_widget.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.suspendCancellableCoroutine -import kotlinx.coroutines.withContext import javax.inject.Inject -import kotlin.coroutines.resume class SettingsController : QkController(), SettingsView { @@ -79,15 +73,11 @@ class SettingsController : QkController = PublishSubject.create() private val startTimeSelectedSubject: Subject> = PublishSubject.create() private val endTimeSelectedSubject: Subject> = PublishSubject.create() private val signatureSubject: Subject = PublishSubject.create() - private val autoDeleteSubject: Subject = PublishSubject.create() private val progressAnimator by lazy { ObjectAnimator.ofInt(syncingProgress, "progress", 0, 0) } @@ -147,8 +137,6 @@ class SettingsController : QkController = signatureSubject - override fun autoDeleteChanged(): Observable = autoDeleteSubject - override fun mmsSizeSelected(): Observable = mmsSizeDialog.adapter.menuItemClicks override fun messageLinkHandlingSelected(): Observable = messageLinkHandlingDialog.adapter.menuItemClicks @@ -189,12 +177,6 @@ class SettingsController : QkController context.getString(R.string.settings_auto_delete_never) - else -> context.resources.getQuantityString( - R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete) - } - longAsMms.checkbox.isChecked = state.longAsMms mmsSize.summary = state.maxMmsSizeSummary @@ -255,20 +237,6 @@ class SettingsController : QkController - AlertDialog.Builder(activity!!) - .setTitle(R.string.settings_auto_delete_warning) - .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages)) - .setOnCancelListener { cont.resume(false) } - .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) } - .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) } - .show() - } - } - override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!) override fun showMessageLinkHandlingDialogPicker() = messageLinkHandlingDialog.show(activity!!) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 0ce4ae60..a7de6f35 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -27,17 +27,12 @@ import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.makeToast -import dev.octoshrimpy.quik.interactor.DeleteOldMessages import dev.octoshrimpy.quik.interactor.SyncMessages import dev.octoshrimpy.quik.manager.BillingManager -import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository -import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.util.Preferences import io.reactivex.rxkotlin.plusAssign -import io.reactivex.schedulers.Schedulers -import kotlinx.coroutines.runBlocking import timber.log.Timber import java.util.Calendar import java.util.concurrent.TimeUnit @@ -49,8 +44,6 @@ class SettingsPresenter @Inject constructor( private val context: Context, private val billingManager: BillingManager, private val dateFormatter: DateFormatter, - private val deleteOldMessages: DeleteOldMessages, - private val messageRepo: MessageRepository, private val navigator: Navigator, private val nightModeManager: NightModeManager, private val prefs: Preferences, @@ -124,9 +117,6 @@ class SettingsPresenter @Inject constructor( disposables += prefs.mobileOnly.asObservable() .subscribe { enabled -> newState { copy(mobileOnly = enabled) } } - disposables += prefs.autoDelete.asObservable() - .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } } - disposables += prefs.longAsMms.asObservable() .subscribe { enabled -> newState { copy(longAsMms = enabled) } } @@ -218,8 +208,6 @@ class SettingsPresenter @Inject constructor( R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get()) - R.id.autoDelete -> view.showAutoDeleteDialog(prefs.autoDelete.get()) - R.id.longAsMms -> prefs.longAsMms.set(!prefs.longAsMms.get()) R.id.mmsSize -> view.showMmsSizePicker() @@ -288,33 +276,6 @@ class SettingsPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe() - view.autoDeleteChanged() - .observeOn(Schedulers.io()) - .filter { maxAge -> - if (maxAge == 0) { - return@filter true - } - - val counts = messageRepo.getOldMessageCounts(maxAge) - if (counts.values.sum() == 0) { - return@filter true - } - - runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } - } - .doOnNext { maxAge -> - when (maxAge == 0) { - true -> AutoDeleteService.cancelJob(context) - false -> { - AutoDeleteService.scheduleJob(context) - deleteOldMessages.execute(Unit) - } - } - } - .doOnNext(prefs.autoDelete::set) - .autoDisposable(view.scope()) - .subscribe() - view.mmsSizeSelected() .autoDisposable(view.scope()) .subscribe(prefs.mmsSize::set) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt index cdb304b5..ed9dfc80 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt @@ -45,7 +45,6 @@ data class SettingsState( val splitSmsEnabled: Boolean = false, val stripUnicodeEnabled: Boolean = false, val mobileOnly: Boolean = false, - val autoDelete: Int = 0, val longAsMms: Boolean = false, val maxMmsSizeSummary: String = "100KB", val maxMmsSizeId: Int = 100, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt index b3396b49..b0670047 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt @@ -32,7 +32,6 @@ interface SettingsView : QkViewContract { fun textSizeSelected(): Observable fun sendDelaySelected(): Observable fun signatureChanged(): Observable - fun autoDeleteChanged(): Observable fun mmsSizeSelected(): Observable fun messageLinkHandlingSelected(): Observable @@ -43,8 +42,6 @@ interface SettingsView : QkViewContract { fun showTextSizePicker() fun showDelayDurationDialog() fun showSignatureDialog(signature: String) - fun showAutoDeleteDialog(days: Int) - suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean fun showMmsSizePicker() fun showMessageLinkHandlingDialogPicker() fun showSwipeActions() diff --git a/presentation/src/main/res/layout/message_utils_controller.xml b/presentation/src/main/res/layout/message_utils_controller.xml index fd63fccb..6bdd8a7e 100644 --- a/presentation/src/main/res/layout/message_utils_controller.xml +++ b/presentation/src/main/res/layout/message_utils_controller.xml @@ -19,6 +19,7 @@ --> + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml index 338142d3..30938a50 100644 --- a/presentation/src/main/res/layout/settings_controller.xml +++ b/presentation/src/main/res/layout/settings_controller.xml @@ -194,14 +194,6 @@ app:title="@string/settings_mobile_title" app:widget="@layout/settings_switch_widget" /> - -