fix(Keyboard): keyboard definition doesn't fallback to default ...

... after getting a null config map
osfans · Dec 13, 2022 · d64d318 · d64d318
1 parent 8d7a554
commit d64d318
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java
@@ -179,8 +179,13 @@ public Keyboard(CharSequence characters, int columns, int horizontalPadding) {
   public Keyboard(String name) {
     this();
     Config config = Config.get();
-    final Map<String, Object> keyboardConfig =
-        (Map<String, Object>) config.keyboards.getObject(name);
+    final Map<String, Object> keyboardConfig;
+    final Object v = config.keyboards.getObject(name);
+    if (v != null) {
+      keyboardConfig = (Map<String, Object>) v;
+    } else {
+      keyboardConfig = (Map<String, Object>) config.keyboards.getObject("default");
+    }
     mLabelTransform = ConfigGetter.getString(keyboardConfig, "label_transform", "none");
     mAsciiMode = ConfigGetter.getInt(keyboardConfig, "ascii_mode", 1);
     if (mAsciiMode == 0)