Skip to content

Commit d64d318

Browse files
committed
fix(Keyboard): keyboard definition doesn't fallback to default ...
... after getting a null config map
1 parent 8d7a554 commit d64d318

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,13 @@ public Keyboard(CharSequence characters, int columns, int horizontalPadding) {
179179
public Keyboard(String name) {
180180
this();
181181
Config config = Config.get();
182-
final Map<String, Object> keyboardConfig =
183-
(Map<String, Object>) config.keyboards.getObject(name);
182+
final Map<String, Object> keyboardConfig;
183+
final Object v = config.keyboards.getObject(name);
184+
if (v != null) {
185+
keyboardConfig = (Map<String, Object>) v;
186+
} else {
187+
keyboardConfig = (Map<String, Object>) config.keyboards.getObject("default");
188+
}
184189
mLabelTransform = ConfigGetter.getString(keyboardConfig, "label_transform", "none");
185190
mAsciiMode = ConfigGetter.getInt(keyboardConfig, "ascii_mode", 1);
186191
if (mAsciiMode == 0)

0 commit comments

Comments
 (0)