From 5a96fabbfc7692415f42d5d7d40127be72f0aa10 Mon Sep 17 00:00:00 2001 From: Claudio Mezzasalma Date: Thu, 5 Dec 2019 10:11:54 +0100 Subject: [PATCH] Rename deviceName config key to device_name Signed-off-by: Claudio Mezzasalma --- app/src/main/java/ohi/andre/consolelauncher/UIManager.java | 2 +- .../andre/consolelauncher/managers/xml/XMLPrefsManager.java | 2 +- .../ohi/andre/consolelauncher/managers/xml/options/Ui.java | 4 ++-- app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java index e5318b1f..266cce2c 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java @@ -1157,7 +1157,7 @@ public boolean onDoubleTap(MotionEvent e) { String deviceFormat = XMLPrefsManager.get(Behavior.device_format); String username = XMLPrefsManager.get(Ui.username); - String deviceName = XMLPrefsManager.get(Ui.deviceName); + String deviceName = XMLPrefsManager.get(Ui.device_name); if (deviceName == null || deviceName.length() == 0) { deviceName = Build.DEVICE; } diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/xml/XMLPrefsManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/xml/XMLPrefsManager.java index 6ee0cf18..67bbdb7e 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/managers/xml/XMLPrefsManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/managers/xml/XMLPrefsManager.java @@ -814,7 +814,7 @@ public IdValue(String value, int id) { // new SimpleMutableEntry("inputFieldBottom", Ui.input_bottom), // new SimpleMutableEntry("username", Ui.username), // new SimpleMutableEntry("showSubmit", Ui.show_enter_button), -// new SimpleMutableEntry("deviceName", Ui.deviceName), +// new SimpleMutableEntry("deviceName", Ui.device_name), // new SimpleMutableEntry("showRam", Ui.show_ram), // new SimpleMutableEntry("showDevice", Ui.show_device_name), // new SimpleMutableEntry("showToolbar", Toolbar.show_toolbar), diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Ui.java b/app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Ui.java index f5d7f77f..5aa8a2b7 100644 --- a/app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Ui.java +++ b/app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Ui.java @@ -332,7 +332,7 @@ public String info() { return "Your username"; } }, - deviceName { + device_name { @Override public String defaultValue() { return Build.DEVICE; @@ -997,4 +997,4 @@ public String getLowercaseString() { public String getString() { return label(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java index 0b168802..1f9ef750 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java +++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java @@ -1004,7 +1004,7 @@ public static String getHint(String currentPath) { String format = XMLPrefsManager.get(Behavior.session_info_format); if(format.length() == 0) return null; - String deviceName = XMLPrefsManager.get(Ui.deviceName); + String deviceName = XMLPrefsManager.get(Ui.device_name); if(deviceName == null || deviceName.length() == 0) { deviceName = Build.DEVICE; }