From 0cfca58350ac7001cabf7f2f96289c054e65f872 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 20 Dec 2020 23:51:01 -0500 Subject: [PATCH 1/6] Add preference for auto-delete --- .../java/com/moez/QKSMS/util/Preferences.kt | 1 + .../{FieldDialog.kt => TextInputDialog.kt} | 8 +-- .../ConversationInfoController.kt | 6 +-- .../feature/settings/SettingsController.kt | 28 ++++++++--- .../feature/settings/SettingsPresenter.kt | 12 ++++- .../QKSMS/feature/settings/SettingsState.kt | 1 + .../QKSMS/feature/settings/SettingsView.kt | 4 +- .../settings/autodelete/AutoDeleteDialog.kt | 50 +++++++++++++++++++ .../ic_baseline_history_toggle_off_24.xml | 10 ++++ .../layout/settings_auto_delete_dialog.xml | 35 +++++++++++++ .../main/res/layout/settings_controller.xml | 8 +++ ...field_dialog.xml => text_input_dialog.xml} | 0 presentation/src/main/res/values/strings.xml | 9 ++++ 13 files changed, 157 insertions(+), 15 deletions(-) rename presentation/src/main/java/com/moez/QKSMS/common/widget/{FieldDialog.kt => TextInputDialog.kt} (82%) create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt create mode 100644 presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml create mode 100644 presentation/src/main/res/layout/settings_auto_delete_dialog.xml rename presentation/src/main/res/layout/{field_dialog.xml => text_input_dialog.xml} (100%) diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index 92794caf..919fab27 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -113,6 +113,7 @@ class Preferences @Inject constructor( val signature = rxPrefs.getString("signature", "") val unicode = rxPrefs.getBoolean("unicode", false) val mobileOnly = rxPrefs.getBoolean("mobileOnly", false) + val autoDelete = rxPrefs.getInteger("autoDelete", 0) val longAsMms = rxPrefs.getBoolean("longAsMms", false) val mmsSize = rxPrefs.getInteger("mmsSize", 300) val logging = rxPrefs.getBoolean("logging", false) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/FieldDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt similarity index 82% rename from presentation/src/main/java/com/moez/QKSMS/common/widget/FieldDialog.kt rename to presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt index 3efb1262..0c9ee56d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/FieldDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt @@ -22,11 +22,11 @@ import android.app.Activity import android.content.DialogInterface import androidx.appcompat.app.AlertDialog import com.moez.QKSMS.R -import com.moez.QKSMS.databinding.FieldDialogBinding +import com.moez.QKSMS.databinding.TextInputDialogBinding -class FieldDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) { +class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) { - private val binding = FieldDialogBinding.inflate(context.layoutInflater) + private val binding = TextInputDialogBinding.inflate(context.layoutInflater) init { binding.field.hint = hint @@ -39,7 +39,7 @@ class FieldDialog(context: Activity, hint: String, listener: (String) -> Unit) : } } - fun setText(text: String): FieldDialog { + fun setText(text: String): TextInputDialog { binding.field.setText(text) return this } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index 293e9b75..07682cf9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -27,7 +27,7 @@ import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.QkChangeHandler import com.moez.QKSMS.common.base.QkController import com.moez.QKSMS.common.util.extensions.scrapViews -import com.moez.QKSMS.common.widget.FieldDialog +import com.moez.QKSMS.common.widget.TextInputDialog import com.moez.QKSMS.databinding.ConversationInfoControllerBinding import com.moez.QKSMS.feature.blocking.BlockingDialog import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule @@ -50,8 +50,8 @@ class ConversationInfoController( @Inject lateinit var navigator: Navigator @Inject lateinit var adapter: ConversationInfoAdapter - private val nameDialog: FieldDialog by lazy { - FieldDialog(activity!!, activity!!.getString(R.string.info_name), nameChangeSubject::onNext) + private val nameDialog: TextInputDialog by lazy { + TextInputDialog(activity!!, activity!!.getString(R.string.info_name), nameChangeSubject::onNext) } private val nameChangeSubject: Subject = PublishSubject.create() 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 f2d652a7..eace81b3 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 @@ -39,11 +39,12 @@ import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.animateLayoutChanges import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setVisible -import com.moez.QKSMS.common.widget.FieldDialog +import com.moez.QKSMS.common.widget.TextInputDialog import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.common.widget.QkSwitch import com.moez.QKSMS.databinding.SettingsControllerBinding import com.moez.QKSMS.feature.settings.about.AboutController +import com.moez.QKSMS.feature.settings.autodelete.AutoDeleteDialog import com.moez.QKSMS.feature.settings.swipe.SwipeActionsController import com.moez.QKSMS.feature.themepicker.ThemePickerController import com.moez.QKSMS.injection.appComponent @@ -69,14 +70,18 @@ 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(binding.syncingProgress, "progress", 0, 0) } @@ -132,7 +137,9 @@ class SettingsController : QkController = sendDelayDialog.adapter.menuItemClicks - override fun signatureSet(): Observable = signatureSubject + override fun signatureChanged(): Observable = signatureSubject + + override fun autoDeleteChanged(): Observable = autoDeleteSubject override fun mmsSizeSelected(): Observable = mmsSizeDialog.adapter.menuItemClicks @@ -167,6 +174,13 @@ class SettingsController : QkController().isChecked = state.stripUnicodeEnabled binding.mobileOnly.widget().isChecked = state.mobileOnly + + 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) + } + binding.longAsMms.widget().isChecked = state.longAsMms binding.mmsSize.summary = state.maxMmsSizeSummary @@ -198,13 +212,13 @@ class SettingsController : QkController + TimePickerDialog(activity, { _, newHour, newMinute -> startTimeSelectedSubject.onNext(Pair(newHour, newMinute)) }, hour, minute, DateFormat.is24HourFormat(activity)).show() } override fun showEndTimePicker(hour: Int, minute: Int) { - TimePickerDialog(activity, TimePickerDialog.OnTimeSetListener { _, newHour, newMinute -> + TimePickerDialog(activity, { _, newHour, newMinute -> endTimeSelectedSubject.onNext(Pair(newHour, newMinute)) }, hour, minute, DateFormat.is24HourFormat(activity)).show() } @@ -215,6 +229,8 @@ class SettingsController : QkController newState { copy(mobileOnly = enabled) } } + disposables += prefs.autoDelete.asObservable() + .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } } + disposables += prefs.longAsMms.asObservable() .subscribe { enabled -> newState { copy(longAsMms = enabled) } } @@ -183,6 +186,8 @@ 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() @@ -242,11 +247,16 @@ class SettingsPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe() - view.signatureSet() + view.signatureChanged() .doOnNext(prefs.signature::set) .autoDisposable(view.scope()) .subscribe() + view.autoDeleteChanged() + .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 f18ccd80..35cf2252 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 @@ -41,6 +41,7 @@ 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 80431508..f0350609 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 @@ -31,7 +31,8 @@ interface SettingsView : QkViewContract { fun nightEndSelected(): Observable> fun textSizeSelected(): Observable fun sendDelaySelected(): Observable - fun signatureSet(): Observable + fun signatureChanged(): Observable + fun autoDeleteChanged(): Observable fun mmsSizeSelected(): Observable fun showQksmsPlusSnackbar() @@ -41,6 +42,7 @@ interface SettingsView : QkViewContract { fun showTextSizePicker() fun showDelayDurationDialog() fun showSignatureDialog(signature: String) + fun showAutoDeleteDialog(days: Int) fun showMmsSizePicker() fun showSwipeActions() fun showThemePicker() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt new file mode 100644 index 00000000..260b0f4f --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.feature.settings.autodelete + +import android.app.Activity +import android.content.DialogInterface +import androidx.appcompat.app.AlertDialog +import com.moez.QKSMS.R +import com.moez.QKSMS.databinding.SettingsAutoDeleteDialogBinding + +class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) { + + private val binding = SettingsAutoDeleteDialogBinding.inflate(context.layoutInflater) + + init { + setView(binding.root) + setTitle(R.string.settings_auto_delete) + setMessage(context.getString(R.string.settings_auto_delete_dialog_message)) + setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> } + setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.settings_auto_delete_never)) { _, _ -> listener(0) } + setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ -> + listener(binding.field.text.toString().toIntOrNull() ?: 0) + } + } + + fun setExpiry(days: Int): AutoDeleteDialog { + when (days) { + 0 -> binding.field.text = null + else -> binding.field.setText(days.toString()) + } + return this + } + +} diff --git a/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml b/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml new file mode 100644 index 00000000..ece916dc --- /dev/null +++ b/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/presentation/src/main/res/layout/settings_auto_delete_dialog.xml b/presentation/src/main/res/layout/settings_auto_delete_dialog.xml new file mode 100644 index 00000000..92830e5c --- /dev/null +++ b/presentation/src/main/res/layout/settings_auto_delete_dialog.xml @@ -0,0 +1,35 @@ + + + diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml index 0ae7a8cf..4fe6e9b3 100644 --- a/presentation/src/main/res/layout/settings_controller.xml +++ b/presentation/src/main/res/layout/settings_controller.xml @@ -177,6 +177,14 @@ app:title="@string/settings_mobile_title" app:widget="@layout/settings_switch_widget" /> + + Remove accents from characters in outgoing SMS messages Mobile numbers only When composing a message, only show mobile numbers + Delete old messages automatically + Messages will be deleted after the specified number of days + Number of days + Never + + Never + After 1 day + After %d days + Send long messages as MMS If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply Auto-compress MMS attachments From b087de8f73cc09c6eb3f272b0df1a77ef35fed71 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 22 Dec 2020 00:00:42 -0500 Subject: [PATCH 2/6] Show warning when enabling autoDelete --- .../QKSMS/repository/MessageRepositoryImpl.kt | 15 ++++++++++++- .../repository/ConversationRepository.kt | 2 +- .../QKSMS/repository/MessageRepository.kt | 5 +++++ .../feature/settings/SettingsController.kt | 21 +++++++++++++++++-- .../feature/settings/SettingsPresenter.kt | 13 ++++++++++++ .../QKSMS/feature/settings/SettingsView.kt | 1 + presentation/src/main/res/values/strings.xml | 1 + 7 files changed, 54 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 1eb62d23..b91846ce 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -66,8 +66,11 @@ import java.io.File import java.io.FileNotFoundException import java.io.FileOutputStream import java.io.IOException +import java.util.* +import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Singleton +import kotlin.collections.ArrayList import kotlin.math.sqrt @Singleton @@ -724,4 +727,14 @@ class MessageRepositoryImpl @Inject constructor( } } -} \ No newline at end of file + override fun getOldMessageCounts(maxAgeDays: Int): Map { + return Realm.getDefaultInstance().use { realm -> + realm.where(Message::class.java) + .lessThan("date", now() - TimeUnit.DAYS.toMillis(maxAgeDays.toLong())) + .findAll() + .groupingBy { message -> message.threadId } + .eachCount() + } + } + +} diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt index 7ccf33ff..e94d1c9f 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt @@ -91,4 +91,4 @@ interface ConversationRepository { fun deleteConversations(vararg threadIds: Long) -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index 217e312a..ce09b206 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -102,4 +102,9 @@ interface MessageRepository { fun deleteMessages(vararg messageIds: Long) + /** + * Returns the number of messages older than [maxAgeDays] per conversation + */ + fun getOldMessageCounts(maxAgeDays: Int): Map + } 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 eace81b3..104a305b 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,6 +24,7 @@ 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 @@ -39,9 +40,9 @@ import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.animateLayoutChanges import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setVisible -import com.moez.QKSMS.common.widget.TextInputDialog import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.common.widget.QkSwitch +import com.moez.QKSMS.common.widget.TextInputDialog import com.moez.QKSMS.databinding.SettingsControllerBinding import com.moez.QKSMS.feature.settings.about.AboutController import com.moez.QKSMS.feature.settings.autodelete.AutoDeleteDialog @@ -55,7 +56,11 @@ import com.uber.autodispose.autoDisposable import io.reactivex.Observable 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 SettingsController : QkController( SettingsControllerBinding::inflate @@ -192,7 +197,8 @@ class SettingsController : QkController { binding.syncingProgress.isVisible = true binding.syncingProgress.max = state.syncProgress.max - progressAnimator.apply { setIntValues(binding.syncingProgress.progress, state.syncProgress.progress) }.start() + progressAnimator.apply { setIntValues(binding.syncingProgress.progress, state.syncProgress.progress) } + .start() binding.syncingProgress.isIndeterminate = state.syncProgress.indeterminate } } @@ -231,6 +237,17 @@ class SettingsController : QkController { cont -> + AlertDialog.Builder(activity!!) + .setMessage(context.resources.getString(R.string.settings_auto_delete_warning, 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 showSwipeActions() { 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 17923df9..708d0671 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 @@ -28,6 +28,7 @@ import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.interactor.SyncMessages import com.moez.QKSMS.manager.AnalyticsManager +import com.moez.QKSMS.repository.MessageRepository import com.moez.QKSMS.repository.SyncRepository import com.moez.QKSMS.util.NightModeManager import com.moez.QKSMS.util.Preferences @@ -35,6 +36,8 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import io.reactivex.schedulers.Schedulers +import kotlinx.coroutines.runBlocking import timber.log.Timber import java.util.* import java.util.concurrent.TimeUnit @@ -47,6 +50,7 @@ class SettingsPresenter @Inject constructor( private val context: Context, private val billingManager: BillingManager, private val dateFormatter: DateFormatter, + private val messageRepo: MessageRepository, private val navigator: Navigator, private val nightModeManager: NightModeManager, private val prefs: Preferences, @@ -253,6 +257,15 @@ class SettingsPresenter @Inject constructor( .subscribe() view.autoDeleteChanged() + .observeOn(Schedulers.io()) + .filter { maxAge -> + if (maxAge == 0) { + return@filter true + } + + val counts = messageRepo.getOldMessageCounts(maxAge) + runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } + } .doOnNext(prefs.autoDelete::set) .autoDisposable(view.scope()) .subscribe() 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 f0350609..853b23d6 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 @@ -43,6 +43,7 @@ interface SettingsView : QkViewContract { fun showDelayDurationDialog() fun showSignatureDialog(signature: String) fun showAutoDeleteDialog(days: Int) + suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean fun showMmsSizePicker() fun showSwipeActions() fun showThemePicker() diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 09dc8371..50f4752a 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -262,6 +262,7 @@ Messages will be deleted after the specified number of days Number of days Never + Are you sure you would like to enable this setting? %1$d messages will be deleted Never After 1 day From 0d6a8c7d12cfaa0a8a0196f8aea358aa30f6c1fe Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 26 Dec 2020 19:54:22 -0500 Subject: [PATCH 3/6] Schedule daily job for deleting old messages --- .../util/extensions/ContextExtensions.kt | 5 ++ .../QKSMS/repository/MessageRepositoryImpl.kt | 13 ++++ .../moez/QKSMS/service/AutoDeleteService.kt | 62 +++++++++++++++++++ .../QKSMS/interactor/DeleteOldMessages.kt | 44 +++++++++++++ .../QKSMS/repository/MessageRepository.kt | 5 ++ presentation/src/main/AndroidManifest.xml | 3 + .../feature/settings/SettingsPresenter.kt | 12 ++++ .../injection/android/ServiceBuilderModule.kt | 7 ++- 8 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt create mode 100644 domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt diff --git a/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt b/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt index 90fc26bb..f5534a9f 100644 --- a/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt +++ b/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt @@ -18,6 +18,7 @@ */ package com.moez.QKSMS.common.util.extensions +import android.app.job.JobScheduler import android.content.Context import android.content.res.ColorStateList import android.graphics.Color @@ -25,6 +26,7 @@ import android.util.TypedValue import android.widget.Toast import androidx.annotation.StringRes import androidx.core.content.ContextCompat +import androidx.core.content.getSystemService import com.moez.QKSMS.util.tryOrNull fun Context.getColorCompat(colorRes: Int): Int { @@ -84,3 +86,6 @@ fun Context.isInstalled(packageName: String): Boolean { val Context.versionCode: Int get() = packageManager.getPackageInfo(packageName, 0).versionCode + +val Context.jobScheduler: JobScheduler + get() = getSystemService()!! diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index b91846ce..a5438d34 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -737,4 +737,17 @@ class MessageRepositoryImpl @Inject constructor( } } + override fun deleteOldMessages(maxAgeDays: Int) { + return Realm.getDefaultInstance().use { realm -> + val messages = realm.where(Message::class.java) + .lessThan("date", now() - TimeUnit.DAYS.toMillis(maxAgeDays.toLong())) + .findAll() + + val uris = messages.map { it.getUri() } + + realm.executeTransaction { messages.deleteAllFromRealm() } + + uris.forEach { uri -> context.contentResolver.delete(uri, null, null) } + } + } } diff --git a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt new file mode 100644 index 00000000..b29edca7 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt @@ -0,0 +1,62 @@ +package com.moez.QKSMS.service + +import android.annotation.SuppressLint +import android.app.job.JobInfo +import android.app.job.JobParameters +import android.app.job.JobService +import android.content.ComponentName +import android.content.Context +import androidx.core.content.getSystemService +import com.moez.QKSMS.common.util.extensions.jobScheduler +import com.moez.QKSMS.interactor.DeleteOldMessages +import dagger.android.AndroidInjection +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign +import kotlinx.coroutines.Job +import timber.log.Timber +import java.util.concurrent.TimeUnit +import javax.inject.Inject + +class AutoDeleteService : JobService() { + + companion object { + private const val JobId = 8120235 + + @SuppressLint("MissingPermission") // Added in [presentation]'s AndroidManifest.xml + fun scheduleJob(context: Context) { + Timber.i("Scheduling job") + val serviceComponent = ComponentName(context, AutoDeleteService::class.java) + val periodicJob = JobInfo.Builder(JobId, serviceComponent) + .setPeriodic(TimeUnit.DAYS.toMillis(1)) + .setPersisted(true) + .build() + + context.jobScheduler.schedule(periodicJob) + } + + fun cancelJob(context: Context) { + Timber.i("Canceling job") + context.jobScheduler.cancel(JobId) + } + } + + @Inject lateinit var deleteOldMessages: DeleteOldMessages + + private val disposables = CompositeDisposable() + + override fun onStartJob(params: JobParameters?): Boolean { + Timber.i("onStartJob") + AndroidInjection.inject(this) + disposables += deleteOldMessages + deleteOldMessages.execute(Unit) { + jobFinished(params, false) + } + return true + } + + override fun onStopJob(params: JobParameters?): Boolean { + Timber.i("onStopJob") + disposables.dispose() + return true + } +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt new file mode 100644 index 00000000..7479933d --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.interactor + +import com.moez.QKSMS.repository.ConversationRepository +import com.moez.QKSMS.repository.MessageRepository +import com.moez.QKSMS.util.Preferences +import io.reactivex.Flowable +import timber.log.Timber +import javax.inject.Inject + +class DeleteOldMessages @Inject constructor( + private val conversationRepo: ConversationRepository, + private val messageRepo: MessageRepository, + private val prefs: Preferences +) : Interactor() { + + override fun buildObservable(params: Unit): Flowable<*> = Flowable.fromCallable { + val maxAge = prefs.autoDelete.get().takeIf { it > 0 } ?: return@fromCallable + val counts = messageRepo.getOldMessageCounts(maxAge) + val threadIds = counts.keys.toLongArray() + + Timber.d("Deleting ${counts.values.sum()} old messages from ${threadIds.size} conversations") + messageRepo.deleteOldMessages(maxAge) + conversationRepo.updateConversations(*threadIds) + } + +} diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index ce09b206..a3ef7c19 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -107,4 +107,9 @@ interface MessageRepository { */ fun getOldMessageCounts(maxAgeDays: Int): Map + /** + * Deletes all messages older than [maxAgeDays] + */ + fun deleteOldMessages(maxAgeDays: Int) + } diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index bdd875b4..796dc6a3 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -184,6 +184,9 @@ + + when (maxAge == 0) { + true -> AutoDeleteService.cancelJob(context) + false -> { + AutoDeleteService.scheduleJob(context) + deleteOldMessages.execute(Unit) + } + } + } .doOnNext(prefs.autoDelete::set) .autoDisposable(view.scope()) .subscribe() diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt index ddc701bd..ffc30e5c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt @@ -22,12 +22,17 @@ import com.moez.QKSMS.feature.backup.RestoreBackupService import com.moez.QKSMS.injection.scope.ActivityScope import com.moez.QKSMS.service.HeadlessSmsSendService import com.moez.QKSMS.receiver.SendSmsReceiver +import com.moez.QKSMS.service.AutoDeleteService import dagger.Module import dagger.android.ContributesAndroidInjector @Module abstract class ServiceBuilderModule { + @ActivityScope + @ContributesAndroidInjector() + abstract fun bindAutoDeleteService(): AutoDeleteService + @ActivityScope @ContributesAndroidInjector() abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService @@ -40,4 +45,4 @@ abstract class ServiceBuilderModule { @ContributesAndroidInjector() abstract fun bindSendSmsReceiver(): SendSmsReceiver -} \ No newline at end of file +} From 0eb2bee2b8f52bcae092b4e7b8a3a39125f696a2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 26 Dec 2020 19:56:52 -0500 Subject: [PATCH 4/6] Upgrade build tools --- presentation/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index 6f0f6797..7ae8cd88 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" + buildToolsVersion "29.0.3" flavorDimensions "analytics" defaultConfig { From e51cdfe69fcd6f41a2f0658a33f3a5f4a23d98dc Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 26 Dec 2020 19:57:01 -0500 Subject: [PATCH 5/6] Improve debug logging format --- .../main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt index bf5c6c8a..aa1dd632 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt @@ -53,7 +53,7 @@ class FileLoggingTree @Inject constructor(private val prefs: Preferences) : Timb } // Format the log to be written to the file - val log = "$timestamp $priorityString/$tag: $message ${Log.getStackTraceString(t)}
".toByteArray() + val log = "$timestamp $priorityString/$tag: $message ${Log.getStackTraceString(t)}\n".toByteArray() // Ensure that only one thread is writing to the file at a time synchronized(fileLock) { @@ -62,7 +62,7 @@ class FileLoggingTree @Inject constructor(private val prefs: Preferences) : Timb val dir = File(Environment.getExternalStorageDirectory(), "QKSMS/Logs").apply { mkdirs() } // Create the file - val file = File(dir, "${SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(System.currentTimeMillis())}.html") + val file = File(dir, "${SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(System.currentTimeMillis())}.log") // Write the log to the file FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(log) } From e6f216fab48401c620d8be9de48c1b776a12e916 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 27 Dec 2020 00:03:47 -0500 Subject: [PATCH 6/6] Auto delete warning popup improvements --- .../com/moez/QKSMS/feature/settings/SettingsController.kt | 3 ++- .../java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt | 4 ++++ presentation/src/main/res/values/strings.xml | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) 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 104a305b..5159f07e 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 @@ -240,7 +240,8 @@ class SettingsController : QkController { cont -> AlertDialog.Builder(activity!!) - .setMessage(context.resources.getString(R.string.settings_auto_delete_warning, messages)) + .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) } 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 a00d5a6f..df35038f 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 @@ -267,6 +267,10 @@ class SettingsPresenter @Inject constructor( } val counts = messageRepo.getOldMessageCounts(maxAge) + if (counts.values.sum() == 0) { + return@filter true + } + runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) } } .doOnNext { maxAge -> diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 50f4752a..1261abf0 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -262,7 +262,8 @@ Messages will be deleted after the specified number of days Number of days Never - Are you sure you would like to enable this setting? %1$d messages will be deleted + Delete old messages automatically? + If you proceed, %1$d messages will be deleted now Never After 1 day