From 125a483591b3ab9b5ad6c48b6a6b56722f859286 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Sun, 9 Feb 2025 13:52:59 +0100 Subject: [PATCH] use context.prefs() instead of the long DeviceProtected... --- .../keyboard/keyboard/KeyboardSwitcher.java | 4 +- .../keyboard/keyboard/KeyboardTheme.kt | 4 +- .../keyboard/keyboard/MainKeyboardView.java | 4 +- .../clipboard/ClipboardHistoryView.kt | 4 +- .../keyboard/emoji/EmojiCategory.java | 4 +- .../keyboard/internal/KeyboardIconsSet.kt | 7 +- .../main/java/helium314/keyboard/latin/App.kt | 7 +- .../keyboard/latin/ClipboardHistoryManager.kt | 5 +- .../latin/DictionaryFacilitatorImpl.java | 4 +- .../keyboard/latin/KeyboardWrapperView.kt | 5 +- .../latin/RichInputMethodManager.java | 10 +-- .../latin/SystemBroadcastReceiver.java | 15 ++-- .../keyboard/latin/define/DebugFlags.kt | 5 +- .../latin/settings/ColorsSettingsFragment.kt | 3 +- .../latin/settings/LanguageFilterList.kt | 4 +- .../latin/settings/LanguageSettingsDialog.kt | 2 +- .../settings/LanguageSettingsFragment.kt | 14 ++-- .../keyboard/latin/settings/Settings.java | 3 +- .../latin/settings/SettingsFragment.java | 4 +- .../settings/UserDictionaryListFragment.java | 4 +- .../AndroidSpellCheckerService.java | 4 +- .../AndroidWordLevelSpellCheckerSession.java | 5 +- .../suggestions/SuggestionStripView.java | 8 +-- .../keyboard/latin/utils/DialogUtils.kt | 2 +- .../keyboard/latin/utils/DictionaryUtils.kt | 4 +- .../keyboard/latin/utils/SubtypeSettings.kt | 7 +- .../keyboard/latin/utils/ToolbarUtils.kt | 6 +- .../keyboard/latin/InputLogicTest.kt | 72 +++++++++---------- .../helium314/keyboard/latin/SuggestTest.kt | 5 +- 29 files changed, 112 insertions(+), 113 deletions(-) diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java index 4e189d88d..92d4d656d 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java +++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java @@ -44,7 +44,7 @@ import helium314.keyboard.latin.settings.SettingsValues; import helium314.keyboard.latin.suggestions.SuggestionStripView; import helium314.keyboard.latin.utils.AdditionalSubtypeUtils; import helium314.keyboard.latin.utils.CapsModeUtils; -import helium314.keyboard.latin.utils.DeviceProtectedUtils; +import helium314.keyboard.latin.utils.KtxKt; import helium314.keyboard.latin.utils.LanguageOnSpacebarUtils; import helium314.keyboard.latin.utils.Log; import helium314.keyboard.latin.utils.RecapitalizeStatus; @@ -651,7 +651,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { mKeyboardView.closing(); } PointerTracker.clearOldViewData(); - final SharedPreferences prefs = DeviceProtectedUtils.getSharedPreferences(displayContext); + final SharedPreferences prefs = KtxKt.prefs(displayContext); if (mSuggestionStripView != null) prefs.unregisterOnSharedPreferenceChangeListener(mSuggestionStripView); if (mClipboardHistoryView != null) diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt b/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt index c7f8b518f..4ab98cc60 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt +++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt @@ -18,7 +18,7 @@ import helium314.keyboard.latin.common.DefaultColors import helium314.keyboard.latin.common.DynamicColors import helium314.keyboard.latin.common.readAllColorsMap import helium314.keyboard.latin.settings.Settings -import helium314.keyboard.latin.utils.DeviceProtectedUtils +import helium314.keyboard.latin.utils.prefs class KeyboardTheme // Note: The themeId should be aligned with "themeId" attribute of Keyboard style in values/themes-