From a323baca5fc3778cf8603bf68fb7b1a0e80b3a90 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Fri, 29 Dec 2023 12:14:33 +0100
Subject: [PATCH] fix toolbar key setting doing nothing

---
 .../latin/settings/PreferencesSettingsFragment.java            | 3 ++-
 .../dslul/openboard/inputmethod/latin/utils/ToolbarUtils.kt    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/PreferencesSettingsFragment.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/PreferencesSettingsFragment.java
index 348c63753..7b9bbef69 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/PreferencesSettingsFragment.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/PreferencesSettingsFragment.java
@@ -94,7 +94,8 @@ public final class PreferencesSettingsFragment extends SubScreenFragment {
         refreshEnablingsOfKeypressSoundAndVibrationAndHistRetentionSettings();
         if (key == null) return;
         switch (key) {
-            case Settings.PREF_MORE_KEYS_ORDER, Settings.PREF_SHOW_POPUP_HINTS, Settings.PREF_SHOW_NUMBER_ROW, Settings.PREF_MORE_KEYS_LABELS_ORDER, "toolbar"
+            case Settings.PREF_MORE_KEYS_ORDER, Settings.PREF_SHOW_POPUP_HINTS, Settings.PREF_SHOW_NUMBER_ROW,
+                    Settings.PREF_MORE_KEYS_LABELS_ORDER, Settings.PREF_TOOLBAR_KEYS
                     -> mReloadKeyboard = true;
             case Settings.PREF_LOCALIZED_NUMBER_ROW -> KeyboardLayoutSet.onSystemLocaleChanged();
             case Settings.PREF_SHOW_HINTS
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ToolbarUtils.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ToolbarUtils.kt
index 4e1a57f93..d7d980a72 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ToolbarUtils.kt
@@ -92,7 +92,7 @@ fun upgradeToolbarPref(prefs: SharedPreferences) {
 }
 
 fun getEnabledToolbarKeys(prefs: SharedPreferences): List<ToolbarKey> {
-    val string = prefs.getString("toolbar", defaultToolbarPref)!!
+    val string = prefs.getString(Settings.PREF_TOOLBAR_KEYS, defaultToolbarPref)!!
     return string.split(";").mapNotNull {
         val split = it.split(",")
         if (split.last() == "true") {