Skip to content

Commit 9a301fd

Browse files
author
Gazala Muhamed
committed
Update to SDK 35, fix bug with empty preference strings
1 parent 1cf2618 commit 9a301fd

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ android {
88
defaultConfig {
99
applicationId "com.gazlaws.codeboard"
1010
minSdkVersion 23
11-
targetSdk 34
12-
versionCode 22
13-
versionName "6.0.2"
11+
targetSdk 35
12+
versionCode 23
13+
versionName "6.0.3"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616
buildTypes {

app/src/main/java/com/gazlaws/codeboard/KeyboardPreferences.java

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,26 @@ public void setSoundEnabled(boolean bool) {
3636
}
3737

3838
public boolean isVibrateEnabled() {
39-
return read("vibrate",
40-
res.getBoolean(R.bool.vibrate));
39+
try {
40+
return read("vibrate",
41+
res.getBoolean(R.bool.vibrate));
42+
}
43+
catch (Exception e){
44+
return true;
45+
}
46+
4147
}
4248

4349
//Note: EditTextPreference saves these as strings. Could be null
4450
public int getVibrateLength() {
51+
try{
4552
return Integer.parseInt(safeRead("vibrate_ms",
4653
String.valueOf(res.getInteger(R.integer.vibrate_length))));
4754
}
55+
catch (Exception e){
56+
return 1;
57+
}
58+
}
4859

4960
public void setVibrateLength(int length) {
5061
write("vibrate_ms", String.valueOf(length));
@@ -71,13 +82,21 @@ public void setFgColor(String color) {
7182
}
7283

7384
public int getPortraitSize() {
85+
try{
7486
return Integer.parseInt(safeRead("size_portrait",
7587
String.valueOf(res.getInteger(R.integer.size_portrait))));
88+
} catch (Exception e){
89+
return 40;
90+
}
7691
}
7792

7893
public int getLandscapeSize() {
79-
return Integer.parseInt(safeRead("size_landscape",
80-
String.valueOf(res.getInteger(R.integer.size_landscape))));
94+
try {
95+
return Integer.parseInt(safeRead("size_landscape",
96+
String.valueOf(res.getInteger(R.integer.size_landscape))));
97+
} catch (Exception e){
98+
return 70;
99+
}
81100
}
82101

83102

0 commit comments

Comments
 (0)