Move auto delete old messages to message management

It fits better here and will help cleaning out the settings page
This commit is contained in:
Inhishonor
2026-01-15 19:34:32 -08:00
parent 29c809ac34
commit 50abd37824
10 changed files with 100 additions and 85 deletions
@@ -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, MessageUtilsState, MessageUtilsPresenter>(), 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<Int> = 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<MessageUtilsView, MessageUtilsState,
state.deduplicationProgress.indeterminate
}
}
binding!!.autoDelete.summary = when (state.autoDelete) {
0 -> 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<Boolean> = Single.create { emitter ->
@@ -95,4 +117,20 @@ class MessageUtilsController : QkController<MessageUtilsView, MessageUtilsState,
binding?.deduplicationProgressText?.isVisible = true
binding?.deduplicationProgressText?.setText(resIdString)
}
override fun autoDeleteChanged(): Observable<Int> = 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()
}
}
}
@@ -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<MessageUtilsView, MessageUtilsState>(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()
}
}
@@ -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,
)
@@ -7,7 +7,12 @@ import io.reactivex.Single
interface MessageUtilsView: QkViewContract<MessageUtilsState> {
val autoDeduplicateClickIntent: Observable<*>
val deduplicateClickIntent: Observable<Unit>
val autoDeleteClickIntent: Observable<Unit>
fun showDeduplicationConfirmationDialog(): Single<Boolean>
fun handleResult(resIdString: Int)
fun autoDeleteChanged(): Observable<Int>
fun showAutoDeleteDialog(days: Int)
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
}
@@ -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, SettingsState, SettingsPresenter>(), SettingsView {
@@ -79,15 +73,11 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
private val signatureDialog: TextInputDialog by lazy {
TextInputDialog(activity!!, context.getString(R.string.settings_signature_title), signatureSubject::onNext)
}
private val autoDeleteDialog: AutoDeleteDialog by lazy {
AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
}
private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
private val signatureSubject: Subject<String> = PublishSubject.create()
private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
private val progressAnimator by lazy { ObjectAnimator.ofInt(syncingProgress, "progress", 0, 0) }
@@ -147,8 +137,6 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
override fun signatureChanged(): Observable<String> = signatureSubject
override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
override fun messageLinkHandlingSelected(): Observable<Int> = messageLinkHandlingDialog.adapter.menuItemClicks
@@ -189,12 +177,6 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
unicode.checkbox.isChecked = state.stripUnicodeEnabled
mobileOnly.checkbox.isChecked = state.mobileOnly
autoDelete.summary = when (state.autoDelete) {
0 -> 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<SettingsView, SettingsState, SettingsPre
override fun showSignatureDialog(signature: String) = signatureDialog.setText(signature).show()
override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
suspendCancellableCoroutine { cont ->
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!!)
@@ -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)
@@ -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,
@@ -32,7 +32,6 @@ interface SettingsView : QkViewContract<SettingsState> {
fun textSizeSelected(): Observable<Int>
fun sendDelaySelected(): Observable<Int>
fun signatureChanged(): Observable<String>
fun autoDeleteChanged(): Observable<Int>
fun mmsSizeSelected(): Observable<Int>
fun messageLinkHandlingSelected(): Observable<Int>
@@ -43,8 +42,6 @@ interface SettingsView : QkViewContract<SettingsState> {
fun showTextSizePicker()
fun showDelayDurationDialog()
fun showSignatureDialog(signature: String)
fun showAutoDeleteDialog(days: Int)
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
fun showMmsSizePicker()
fun showMessageLinkHandlingDialogPicker()
fun showSwipeActions()
@@ -19,6 +19,7 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/contentView"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -72,6 +73,18 @@
app:title="@string/auto_deduplicate_messages_title"
app:widget="@layout/settings_switch_widget" />
<dev.octoshrimpy.quik.common.widget.QkTextView
style="@style/PreferenceCategory"
android:text="@string/settings_category_general" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/autoDelete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_baseline_history_toggle_off_24"
app:title="@string/settings_auto_delete"
tools:summary="Never" />
</LinearLayout>
</ScrollView>
@@ -194,14 +194,6 @@
app:title="@string/settings_mobile_title"
app:widget="@layout/settings_switch_widget" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/autoDelete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_baseline_history_toggle_off_24"
app:title="@string/settings_auto_delete"
tools:summary="Never" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/longAsMms"
android:layout_width="match_parent"