From 13c353a542cbc6abff8080a55385663212004fa8 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Wed, 19 Aug 2020 12:12:24 +0200 Subject: [PATCH] PreferencesFragment: fix the reblog confirmation switch The switch changed the value for showing cards in timelines instead of asking if you really want to reblog posts. --- .../tusky/fragment/preference/PreferencesFragment.kt | 11 +++++++++-- .../keylesspalace/tusky/settings/SettingsConstants.kt | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt index 73edde28..5fa6bb39 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt @@ -125,6 +125,13 @@ class PreferencesFragment : PreferenceFragmentCompat() { isSingleLineTitle = false } + switchPreference { + setDefaultValue(false) + key = PrefKeys.SHOW_CARDS_IN_TIMELINES + setTitle(R.string.pref_title_show_cards_in_timelines) + isSingleLineTitle = false + } + switchPreference { setDefaultValue(true) key = PrefKeys.SHOW_NOTIFICATIONS_FILTER @@ -141,8 +148,8 @@ class PreferencesFragment : PreferenceFragmentCompat() { } switchPreference { - setDefaultValue(false) - key = PrefKeys.SHOW_CARDS_IN_TIMELINES + setDefaultValue(true) + key = PrefKeys.CONFIRM_REBLOGS setTitle(R.string.pref_title_confirm_reblogs) isSingleLineTitle = false } diff --git a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt index e1806ced..efb2bb64 100644 --- a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt +++ b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt @@ -28,6 +28,7 @@ object PrefKeys { const val USE_BLURHASH = "useBlurhash" const val SHOW_NOTIFICATIONS_FILTER = "showNotificationsFilter" const val SHOW_CARDS_IN_TIMELINES = "showCardsInTimelines" + const val CONFIRM_REBLOGS = "confirmReblogs" const val ENABLE_SWIPE_FOR_TABS = "enableSwipeForTabs" const val BIG_EMOJIS = "bigEmojis" const val STICKERS = "stickers"