Skip to content

Rename deviceName config key to device_name #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lorthirk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename deviceName config key to device_name #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/ohi/andre/consolelauncher/UIManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/ohi/andre/consolelauncher/managers/xml/XMLPrefsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Ui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ public String info() {
return "Your username";
}
},
deviceName {
device_name {
@Override
public String defaultValue() {
return Build.DEVICE;
Expand Down Expand Up @@ -997,4 +997,4 @@ public String getLowercaseString() {
public String getString() {
return label();
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down