diff --git a/common/src/main/java/com/moez/QKSMS/util/Utils.kt b/common/src/main/java/com/moez/QKSMS/util/Utils.kt index 037751c2..1a2d9261 100644 --- a/common/src/main/java/com/moez/QKSMS/util/Utils.kt +++ b/common/src/main/java/com/moez/QKSMS/util/Utils.kt @@ -19,6 +19,13 @@ package dev.octoshrimpy.quik.util import timber.log.Timber +import java.security.MessageDigest + +private val sha256Digest = object : ThreadLocal() { + override fun initialValue(): MessageDigest { + return MessageDigest.getInstance("SHA-256") + } +} fun tryOrNull(logOnError: Boolean = true, body: () -> T?): T? { return try { @@ -35,4 +42,12 @@ fun tryOrNull(logOnError: Boolean = true, body: () -> T?): T? { fun nonDebugPackageName(packageName: String): String { return if (packageName.endsWith(".debug")) packageName.removeSuffix(".debug") else packageName -} \ No newline at end of file +} + +fun sha256(input: String): String { + val digest = sha256Digest.get() + digest!!.reset() + + val hashBytes = digest.digest(input.toByteArray(Charsets.UTF_8)) + return hashBytes.joinToString("") { String.format("%02x", it) } +} 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 7077c005..73fc3d55 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -62,7 +62,11 @@ import dev.octoshrimpy.quik.receiver.SendDelayedMessageReceiver.Companion.MESSAG import dev.octoshrimpy.quik.util.ImageUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences +import dev.octoshrimpy.quik.util.sha256 import dev.octoshrimpy.quik.util.tryOrNull +import io.reactivex.Flowable +import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.Subject import io.realm.Case import io.realm.Realm import io.realm.RealmList @@ -87,6 +91,9 @@ open class MessageRepositoryImpl @Inject constructor( private val cursorToPart: CursorToPart, ) : MessageRepository { + override val deduplicationProgress: Subject = + BehaviorSubject.createDefault(MessageRepository.DeduplicationProgress.Idle) + companion object { const val TELEPHONY_UPDATE_CHUNK_SIZE = 200 } @@ -1025,5 +1032,61 @@ open class MessageRepositoryImpl @Inject constructor( uri -> context.contentResolver.delete(uri, null, null) } } -} + override fun deduplicateMessages(): Flowable = + Flowable.fromCallable { + val duplicateIds = findDuplicateMessages() + if (duplicateIds.isEmpty()) { + MessageRepository.DeduplicationResult.NoDuplicates + } else { + deduplicationProgress.onNext(MessageRepository.DeduplicationProgress.Running(0, 0, true)) + deleteMessages(duplicateIds) + MessageRepository.DeduplicationResult.Success + } + } + .onErrorReturn { MessageRepository.DeduplicationResult.Failure(it) } + .doFinally { + deduplicationProgress.onNext(MessageRepository.DeduplicationProgress.Idle) + } + + private fun findDuplicateMessages(): List { + val seenSignatures = HashSet() + val duplicateIds = ArrayList() + + Realm.getDefaultInstance().use { realm -> + val allMessages = realm.where(Message::class.java) + .sort("id", Sort.ASCENDING) + .findAll() + + val max = allMessages.size + var progress = 0 + + allMessages.forEach { message -> + ++progress + tryOrNull { + if (progress % 100 == 0 || progress == max) { + deduplicationProgress.onNext( + MessageRepository.DeduplicationProgress.Running(max, progress, false) + ) + } + val signature = messageHash(message) + if (!seenSignatures.add(signature)) { + duplicateIds.add(message.id) + } + } + } + } + return duplicateIds + } + + private fun messageHash(message: Message): String { + val signatureString= buildString { + append(message.address).append('|') + append(message.dateSent).append('|') + append(message.boxId).append('|') + append(message.body).append('|') + append(message.attachmentTypeString) + } + return sha256(signatureString) + } +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index b6298564..80e1f238 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -45,8 +45,10 @@ import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SyncLog +import dev.octoshrimpy.quik.interactor.DeduplicateMessages import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.tryOrNull +import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import io.realm.Realm @@ -54,6 +56,7 @@ import io.realm.RealmList import io.realm.Sort import timber.log.Timber import javax.inject.Inject +import javax.inject.Provider import javax.inject.Singleton @Singleton @@ -69,6 +72,7 @@ class SyncRepositoryImpl @Inject constructor( private val cursorToContactGroupMember: CursorToContactGroupMember, private val keys: KeyManager, private val phoneNumberUtils: PhoneNumberUtils, + private val messageRepo: Provider, private val rxPrefs: RxSharedPreferences, private val reactions: EmojiReactionRepository, ) : SyncRepository { @@ -234,6 +238,25 @@ class SyncRepositoryImpl @Inject constructor( // Now that we have all the messages, we can scan for emoji reactions reactions.deleteAndReparseAllEmojiReactions(realm) + if (rxPrefs.getBoolean("autoDeduplicateMessages").get()) { + DeduplicateMessages(messageRepo.get()) + .buildObservable(Unit) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { result -> + when (result) { + is MessageRepository.DeduplicationResult.NoDuplicates -> { + Timber.i("No duplicate messages found.") + } + is MessageRepository.DeduplicationResult.Success -> { + Timber.i("Deleted duplicate messages") + } + is MessageRepository.DeduplicationResult.Failure -> { + Timber.e(result.error, "Deduplication failed") + } + } + } + } + realm.insert(SyncLog()) }, { handlerThread.quitSafely() diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt new file mode 100644 index 00000000..4b2a47cd --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeduplicateMessages.kt @@ -0,0 +1,33 @@ +/* + * 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 dev.octoshrimpy.quik.interactor + +import dev.octoshrimpy.quik.repository.MessageRepository +import io.reactivex.Flowable +import io.reactivex.schedulers.Schedulers +import javax.inject.Inject + +class DeduplicateMessages @Inject constructor( + private val messageRepo: MessageRepository +) : Interactor() { + + override fun buildObservable(params: Unit): Flowable = + messageRepo.deduplicateMessages() + .subscribeOn(Schedulers.io()) +} 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 e0c31924..3522f9e7 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -22,9 +22,24 @@ import android.net.Uri import dev.octoshrimpy.quik.model.Attachment import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.MmsPart +import io.reactivex.Flowable +import io.reactivex.Observable import io.realm.RealmResults interface MessageRepository { + sealed class DeduplicationProgress { + object Idle : DeduplicationProgress() + data class Running(val max: Int, val progress: Int, val indeterminate: Boolean) : DeduplicationProgress() + } + + sealed class DeduplicationResult { + object Success : DeduplicationResult() + object NoDuplicates : DeduplicationResult() + data class Failure(val error: Throwable) : DeduplicationResult() + } + + val deduplicationProgress: Observable + fun getMessages(threadId: Long, query: String = ""): RealmResults fun getMessagesSync(threadId: Long, query: String = ""): RealmResults @@ -88,5 +103,7 @@ interface MessageRepository { fun deleteOldMessages(maxAgeDays: Int) + fun deduplicateMessages(): Flowable + fun markAsSendingNow(messageId: Long) } 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 a84826c2..fd85af50 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -136,6 +136,8 @@ class Preferences @Inject constructor( val logging = rxPrefs.getBoolean("logging", false) val unreadAtTop = rxPrefs.getBoolean("unreadAtTop", false) + val autoDeduplicate = rxPrefs.getBoolean("autoDeduplicateMessages", false) + init { // Migrate from old night mode preference to new one, now that we support android Q night mode val nightModeSummary = rxPrefs.getInteger("nightModeSummary") diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 1a54fb61..87261618 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -103,6 +103,7 @@ android:name="android.service.chooser.chooser_target_service" android:value=".common.util.QkChooserTargetService" /> + { fun drawerToggled(opened: Boolean) } -enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE } +enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, MESSAGE_UTILS, SETTINGS, PLUS, HELP, INVITE } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index cdfe7194..6849959e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -331,6 +331,7 @@ class MainViewModel @Inject constructor( NavItem.BACKUP -> navigator.showBackup() NavItem.SCHEDULED -> navigator.showScheduled(null) NavItem.BLOCKING -> navigator.showBlockedConversations() + NavItem.MESSAGE_UTILS -> navigator.showMessageUtils() NavItem.SETTINGS -> navigator.showSettings() // NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu") // NavItem.HELP -> navigator.showSupport() 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 new file mode 100644 index 00000000..674cd5d4 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsActivity.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 dev.octoshrimpy.quik.feature.messageutils + +import android.os.Bundle +import com.bluelinelabs.conductor.Conductor +import com.bluelinelabs.conductor.Router +import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.common.base.QkThemedActivity +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding + +class MessageUtilsActivity : QkThemedActivity() { + private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding + + override fun onCreate(savedInstanceState: Bundle?) { + AndroidInjection.inject(this) + super.onCreate(savedInstanceState) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) + + router = Conductor.attachRouter(this, binding.container, savedInstanceState) + if (!router.hasRootController()) { + router.setRoot(RouterTransaction.with(MessageUtilsController())) + } + } + + override fun onBackPressed() { + if (!router.handleBack()) { + 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 new file mode 100644 index 00000000..32b275fb --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsController.kt @@ -0,0 +1,98 @@ +package dev.octoshrimpy.quik.feature.messageutils + +import android.animation.ObjectAnimator +import android.app.AlertDialog +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.view.isVisible +import com.jakewharton.rxbinding2.view.clicks +import dev.octoshrimpy.quik.R +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.injection.appComponent +import dev.octoshrimpy.quik.repository.MessageRepository +import io.reactivex.Single +import javax.inject.Inject +class MessageUtilsController : QkController(), MessageUtilsView { + @Inject override lateinit var presenter: MessageUtilsPresenter + private var binding: MessageUtilsControllerBinding? = null + override val autoDeduplicateClickIntent by lazy { binding!!.autoDeduplicate.clicks() } + override val deduplicateClickIntent by lazy { binding!!.deduplicateMessages.clicks() } + + init { + appComponent.inject(this) + retainViewMode = RetainViewMode.RETAIN_DETACH + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View { + binding = MessageUtilsControllerBinding.inflate(inflater, container, false) + return binding!!.root + } + + override fun onViewCreated() { + super.onViewCreated() + (binding?.root as? ViewGroup)?.postDelayed({ + binding?.parent?.animateLayoutChanges = true + }, 100) + } + + override fun onAttach(view: View) { + super.onAttach(view) + setTitle(R.string.message_management_title) + showBackButton(true) + presenter.bindIntents(this) + } + + override fun onDestroyView(view: View) { + super.onDestroyView(view) + binding = null + } + + override fun render(state: MessageUtilsState) { + binding?.autoDeduplicate + ?.findViewById(R.id.checkbox) + ?.isChecked = state.autoDeduplicateMessages + + val deduplicationProgress = binding!!.deduplicationProgress + val progressAnimator = ObjectAnimator.ofInt(deduplicationProgress, "progress", 0, 0) + + when (state.deduplicationProgress) { + is MessageRepository.DeduplicationProgress.Idle -> { + deduplicationProgress.isVisible = false + } + + is MessageRepository.DeduplicationProgress.Running -> { + deduplicationProgress.isVisible = true + deduplicationProgress.max = state.deduplicationProgress.max + progressAnimator + .apply { + setIntValues( + deduplicationProgress.progress, + state.deduplicationProgress.progress + ) + } + .start() + deduplicationProgress.isIndeterminate = + state.deduplicationProgress.indeterminate + } + } + } + + override fun showDeduplicationConfirmationDialog(): Single = Single.create { emitter -> + AlertDialog.Builder(activity) + .setTitle(R.string.deduplicate_messages_title) + .setMessage(R.string.deduplicate_message_confirmation_dialog_message) + .setPositiveButton(R.string.button_continue) { _, _ -> emitter.onSuccess(true) } + .setNegativeButton(R.string.button_cancel) { _, _ -> emitter.onSuccess(false) } + .setCancelable(false) + .show() + } + + override fun handleResult(resIdString: Int) { + binding?.deduplicationProgressText?.isVisible = true + binding?.deduplicationProgressText?.setText(resIdString) + } +} 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 new file mode 100644 index 00000000..97662b63 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsPresenter.kt @@ -0,0 +1,65 @@ +package dev.octoshrimpy.quik.feature.messageutils + +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.repository.MessageRepository +import dev.octoshrimpy.quik.util.Preferences +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.schedulers.Schedulers +import timber.log.Timber +import java.util.concurrent.TimeUnit +import javax.inject.Inject + +class MessageUtilsPresenter @Inject constructor( + private val deduplicateMessages: DeduplicateMessages, + private val prefs: Preferences, + messageRepo: MessageRepository +) : QkPresenter(MessageUtilsState()) { + init { + disposables += messageRepo.deduplicationProgress + .sample(16, TimeUnit.MILLISECONDS) + .distinctUntilChanged() + .subscribe { deduplicateProgress -> newState { copy(deduplicationProgress = deduplicateProgress)}} + + disposables += prefs.autoDeduplicate.asObservable() + .subscribe { enabled -> newState { copy(autoDeduplicateMessages = enabled) } } + } + + override fun bindIntents(view: MessageUtilsView) { + super.bindIntents(view) + + view.deduplicateClickIntent + .flatMapSingle { view.showDeduplicationConfirmationDialog() } + .filter { it } + .observeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe { + deduplicateMessages.buildObservable(Unit) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { result -> + when (result) { + is MessageRepository.DeduplicationResult.Success -> { + view.handleResult(R.string.deduplicating_messages_finished) + } + + is MessageRepository.DeduplicationResult.NoDuplicates -> { + view.handleResult(R.string.deduplicating_messages_no_messages) + } + + is MessageRepository.DeduplicationResult.Failure -> { + view.handleResult(R.string.deduplicating_messages_failed) + Timber.e("Error: ${result.error.localizedMessage}") + } + } + } + } + + view.autoDeduplicateClickIntent + .autoDisposable(view.scope()) + .subscribe { prefs.autoDeduplicate.set(!prefs.autoDeduplicate.get()) } + } +} \ 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 new file mode 100644 index 00000000..e09528cb --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsState.kt @@ -0,0 +1,8 @@ +package dev.octoshrimpy.quik.feature.messageutils + +import dev.octoshrimpy.quik.repository.MessageRepository + +data class MessageUtilsState( + val autoDeduplicateMessages: Boolean = false, + val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle +) 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 new file mode 100644 index 00000000..b7919308 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/messageutils/MessageUtilsView.kt @@ -0,0 +1,13 @@ +package dev.octoshrimpy.quik.feature.messageutils + +import dev.octoshrimpy.quik.common.base.QkViewContract +import io.reactivex.Observable +import io.reactivex.Single + +interface MessageUtilsView: QkViewContract { + val autoDeduplicateClickIntent: Observable<*> + val deduplicateClickIntent: Observable + + fun showDeduplicationConfirmationDialog(): Single + fun handleResult(resIdString: Int) +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index 6c96873b..0386c9df 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -38,6 +38,7 @@ import dev.octoshrimpy.quik.feature.blocking.messages.BlockedMessagesController import dev.octoshrimpy.quik.feature.blocking.numbers.BlockedNumbersController import dev.octoshrimpy.quik.feature.compose.editing.DetailedChipView import dev.octoshrimpy.quik.feature.conversationinfo.injection.ConversationInfoComponent +import dev.octoshrimpy.quik.feature.messageutils.MessageUtilsController import dev.octoshrimpy.quik.feature.settings.SettingsController import dev.octoshrimpy.quik.feature.settings.about.AboutController import dev.octoshrimpy.quik.feature.settings.swipe.SwipeActionsController @@ -69,6 +70,7 @@ interface AppComponent { fun inject(controller: MessageContentFiltersController) fun inject(controller: BlockingController) fun inject(controller: BlockingManagerController) + fun inject(controller: MessageUtilsController) fun inject(controller: SettingsController) fun inject(controller: SwipeActionsController) diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index 69eda914..14db8648 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -31,6 +31,7 @@ import dev.octoshrimpy.quik.feature.gallery.GalleryActivity import dev.octoshrimpy.quik.feature.gallery.GalleryActivityModule import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.feature.main.MainActivityModule +import dev.octoshrimpy.quik.feature.messageutils.MessageUtilsActivity import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivityModule import dev.octoshrimpy.quik.feature.plus.PlusActivity @@ -85,6 +86,10 @@ abstract class ActivityBuilderModule { @ContributesAndroidInjector(modules = [ScheduledActivityModule::class]) abstract fun bindScheduledActivity(): ScheduledActivity + @ActivityScope + @ContributesAndroidInjector(modules = []) + abstract fun bindMessageUtilsActivity(): MessageUtilsActivity + @ActivityScope @ContributesAndroidInjector(modules = []) abstract fun bindSettingsActivity(): SettingsActivity diff --git a/presentation/src/main/res/drawable/auto_delete.xml b/presentation/src/main/res/drawable/auto_delete.xml new file mode 100644 index 00000000..bd302fa2 --- /dev/null +++ b/presentation/src/main/res/drawable/auto_delete.xml @@ -0,0 +1,10 @@ + + + diff --git a/presentation/src/main/res/drawable/dashboard_2_gear.xml b/presentation/src/main/res/drawable/dashboard_2_gear.xml new file mode 100644 index 00000000..c64e5ce0 --- /dev/null +++ b/presentation/src/main/res/drawable/dashboard_2_gear.xml @@ -0,0 +1,10 @@ + + + diff --git a/presentation/src/main/res/drawable/delete_sweep.xml b/presentation/src/main/res/drawable/delete_sweep.xml new file mode 100644 index 00000000..4f73cf51 --- /dev/null +++ b/presentation/src/main/res/drawable/delete_sweep.xml @@ -0,0 +1,10 @@ + + + diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml index 811f7b87..ce31f2cb 100644 --- a/presentation/src/main/res/layout/drawer_view.xml +++ b/presentation/src/main/res/layout/drawer_view.xml @@ -139,6 +139,21 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index e765b0f4..3fbf157c 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ Scheduled Blocking More + Message Management Settings DEPRECATED - drawer_plus Help & feedback @@ -387,6 +388,16 @@ Continue to %s and allow these numbers + Deduplicate Messages + Remove Duplicate Messages + Scans through message database and deletes all messages that exactly match original messages + Your message database will be scanned for duplicates, and then those duplicates will be removed.\nThis will automatically delete messages, only proceed if you understand the consequences. + Automatically Deduplicate Messages + Deduplication will be performed during sync. Please note, this will automatically delete messages, and while the chance of there being a false duplicate is very low, it is still possible.\nPlease exercise caution. + Finished deduplicating messages! + No duplicate messages found. + Deduplicating messages failed, please try again + About Version Developer