forked from upstream-mirrors/quik
Add a deduplicate message feature
- Adds a new class of features for message management. - Adds a manual option to find and delete duplicate messages - Adds a setting to automatically delete duplicates during sync - Adds a sha256 hashing function Co-authored-by: octoshrimpy <octoshrimpy@users.noreply.github.com>
This commit is contained in:
@@ -37,6 +37,7 @@ import dev.octoshrimpy.quik.feature.compose.ComposeActivity
|
||||
import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoActivity
|
||||
import dev.octoshrimpy.quik.feature.gallery.GalleryActivity
|
||||
import dev.octoshrimpy.quik.feature.main.MainActivity
|
||||
import dev.octoshrimpy.quik.feature.messageutils.MessageUtilsActivity
|
||||
import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity
|
||||
import dev.octoshrimpy.quik.feature.plus.PlusActivity
|
||||
import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity
|
||||
@@ -172,6 +173,11 @@ class Navigator @Inject constructor(
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showMessageUtils() {
|
||||
val intent = Intent(context, MessageUtilsActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showSettings() {
|
||||
val intent = Intent(context, SettingsActivity::class.java)
|
||||
startActivity(intent)
|
||||
|
||||
@@ -99,6 +99,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
backup.clicks().map { NavItem.BACKUP },
|
||||
scheduled.clicks().map { NavItem.SCHEDULED },
|
||||
blocking.clicks().map { NavItem.BLOCKING },
|
||||
messageUtils.clicks().map { NavItem.MESSAGE_UTILS },
|
||||
settings.clicks().map { NavItem.SETTINGS },
|
||||
// plus.clicks().map { NavItem.PLUS },
|
||||
// help.clicks().map { NavItem.HELP },
|
||||
|
||||
@@ -58,4 +58,4 @@ interface MainView : QkView<MainState> {
|
||||
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 }
|
||||
|
||||
@@ -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()
|
||||
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
+98
@@ -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, MessageUtilsState, MessageUtilsPresenter>(), 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<QkSwitch>(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<Boolean> = 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)
|
||||
}
|
||||
}
|
||||
+65
@@ -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<MessageUtilsView, MessageUtilsState>(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()) }
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
)
|
||||
@@ -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<MessageUtilsState> {
|
||||
val autoDeduplicateClickIntent: Observable<*>
|
||||
val deduplicateClickIntent: Observable<Unit>
|
||||
|
||||
fun showDeduplicationConfirmationDialog(): Single<Boolean>
|
||||
fun handleResult(resIdString: Int)
|
||||
}
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user