changes to add a new setting that allows user to choose to allow all message links, block all message links (including in notifications), or ask via a dialog box whether the user wishes to proceed

This commit is contained in:
gavine99
2025-02-02 21:23:01 +11:00
parent f32e0b4528
commit d7514d65b6
13 changed files with 199 additions and 48 deletions
@@ -41,7 +41,6 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
import dev.octoshrimpy.quik.common.util.extensions.setVisible
import dev.octoshrimpy.quik.common.widget.PreferenceView
import dev.octoshrimpy.quik.common.widget.QkSwitch
import dev.octoshrimpy.quik.common.widget.TextInputDialog
import dev.octoshrimpy.quik.feature.settings.about.AboutController
import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog
@@ -73,6 +72,7 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
@Inject lateinit var textSizeDialog: QkDialog
@Inject lateinit var sendDelayDialog: QkDialog
@Inject lateinit var mmsSizeDialog: QkDialog
@Inject lateinit var messageLinkHandlingDialog: QkDialog
@Inject override lateinit var presenter: SettingsPresenter
@@ -113,6 +113,7 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
textSizeDialog.adapter.setData(R.array.text_sizes)
sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
messageLinkHandlingDialog.adapter.setData(R.array.messageLinkHandlings, R.array.messageLinkHandling_ids)
about.summary = context.getString(R.string.settings_version, BuildConfig.VERSION_NAME)
}
@@ -150,6 +151,8 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
override fun messageLinkHandlingSelected(): Observable<Int> = messageLinkHandlingDialog.adapter.menuItemClicks
override fun render(state: SettingsState) {
themePreview.setBackgroundTint(state.theme)
night.summary = state.nightModeSummary
@@ -195,6 +198,9 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
mmsSize.summary = state.maxMmsSizeSummary
mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId
messsageLinkHandling.summary = state.messageLinkHandlingSummary
messageLinkHandlingDialog.adapter.selectedItem = state.messageLinkHandlingId
when (state.syncProgress) {
is SyncRepository.SyncProgress.Idle -> syncingProgress.isVisible = false
@@ -254,6 +260,8 @@ class SettingsController : QkController<SettingsView, SettingsState, SettingsPre
override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
override fun showMessageLinkHandlingDialogPicker() = messageLinkHandlingDialog.show(activity!!)
override fun showSwipeActions() {
router.pushController(RouterTransaction.with(SwipeActionsController())
.pushChangeHandler(QkChangeHandler())
@@ -138,6 +138,19 @@ class SettingsPresenter @Inject constructor(
newState { copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) }
}
val messageLinkHandlingLabels = context.resources.getStringArray(R.array.messageLinkHandlings)
val messageLinkHandlingIds = context.resources.getIntArray(R.array.messageLinkHandling_ids)
disposables += prefs.messageLinkHandling.asObservable()
.subscribe { messageLinkHandlingId ->
val index = messageLinkHandlingIds.indexOf(messageLinkHandlingId)
newState {
copy(
messageLinkHandlingSummary = messageLinkHandlingLabels[index],
messageLinkHandlingId = messageLinkHandlingId
)
}
}
disposables += syncRepo.syncProgress
.sample(16, TimeUnit.MILLISECONDS)
.distinctUntilChanged()
@@ -204,6 +217,8 @@ class SettingsPresenter @Inject constructor(
R.id.mmsSize -> view.showMmsSizePicker()
R.id.messsageLinkHandling -> view.showMessageLinkHandlingDialogPicker()
R.id.sync -> syncMessages.execute(Unit)
R.id.about -> view.showAbout()
@@ -294,6 +309,10 @@ class SettingsPresenter @Inject constructor(
view.mmsSizeSelected()
.autoDisposable(view.scope())
.subscribe(prefs.mmsSize::set)
view.messageLinkHandlingSelected()
.autoDisposable(view.scope())
.subscribe(prefs.messageLinkHandling::set)
}
}
@@ -46,5 +46,7 @@ data class SettingsState(
val longAsMms: Boolean = false,
val maxMmsSizeSummary: String = "100KB",
val maxMmsSizeId: Int = 100,
val messageLinkHandlingSummary: String = "Ask before opening",
val messageLinkHandlingId: Int = 2,
val syncProgress: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle
)
@@ -34,6 +34,7 @@ interface SettingsView : QkViewContract<SettingsState> {
fun signatureChanged(): Observable<String>
fun autoDeleteChanged(): Observable<Int>
fun mmsSizeSelected(): Observable<Int>
fun messageLinkHandlingSelected(): Observable<Int>
fun showQksmsPlusSnackbar()
fun showNightModeDialog()
@@ -45,6 +46,7 @@ interface SettingsView : QkViewContract<SettingsState> {
fun showAutoDeleteDialog(days: Int)
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
fun showMmsSizePicker()
fun showMessageLinkHandlingDialogPicker()
fun showSwipeActions()
fun showThemePicker()
fun showAbout()