From 8cb9b3046110b17d93553edd8aedbae40748b2c5 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 6 Jul 2025 21:57:41 +0200
Subject: Fix crash with unexpected value in NumberLayout pref (#1036)

---
 srcs/juloo.keyboard2/Config.java       |  2 +-
 srcs/juloo.keyboard2/NumberLayout.java | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'srcs')

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index eafb236..6fcb434 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -168,7 +168,7 @@ public final class Config
     switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
     extra_keys_param = ExtraKeysPreference.get_extra_keys(_prefs);
     extra_keys_custom = CustomExtraKeysPreference.get(_prefs);
-    selected_number_layout = NumberLayout.valueOf(_prefs.getString("number_entry_layout",  "pin").toUpperCase());
+    selected_number_layout = NumberLayout.of_string(_prefs.getString("number_entry_layout", "pin"));
     current_layout_portrait = _prefs.getInt("current_layout_portrait", 0);
     current_layout_landscape = _prefs.getInt("current_layout_landscape", 0);
     current_layout_unfolded_portrait = _prefs.getInt("current_layout_unfolded_portrait", 0);
diff --git a/srcs/juloo.keyboard2/NumberLayout.java b/srcs/juloo.keyboard2/NumberLayout.java
index b059e10..4fbbe58 100644
--- a/srcs/juloo.keyboard2/NumberLayout.java
+++ b/srcs/juloo.keyboard2/NumberLayout.java
@@ -1,7 +1,17 @@
 package juloo.keyboard2;
 
 public enum NumberLayout {
-    PIN,
-    NUMBER,
-    NORMAL
+  PIN,
+  NUMBER,
+  NORMAL;
+
+  public static NumberLayout of_string(String name)
+  {
+    switch (name)
+    {
+      case "number": return NUMBER;
+      case "normal": return NORMAL;
+      case "pin": default: return PIN;
+    }
+  }
 }
-- 
cgit v1.2.3