Skip to content

Commit b12f9e4

Browse files
committed
refactor: enhance exception handling of the config traversing
1 parent 5684366 commit b12f9e4

File tree

1 file changed

+4
-4
lines changed
  • app/src/main/java/com/osfans/trime/util/config

1 file changed

+4
-4
lines changed

app/src/main/java/com/osfans/trime/util/config/Config.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Config(private val data: ConfigData = ConfigData()) {
4646
): Boolean {
4747
Timber.d("read: $path")
4848
val p = data.traverse(path)?.configValue
49-
return p?.getBool() ?: defValue
49+
return runCatching { p?.getBool() }.getOrNull() ?: defValue
5050
}
5151

5252
fun getInt(
@@ -55,7 +55,7 @@ class Config(private val data: ConfigData = ConfigData()) {
5555
): Int {
5656
Timber.d("read: $path")
5757
val p = data.traverse(path)?.configValue
58-
return p?.getInt() ?: defValue
58+
return runCatching { p?.getInt() }.getOrNull() ?: defValue
5959
}
6060

6161
fun getFloat(
@@ -64,7 +64,7 @@ class Config(private val data: ConfigData = ConfigData()) {
6464
): Float {
6565
Timber.d("read: $path")
6666
val p = data.traverse(path)?.configValue
67-
return p?.getFloat() ?: defValue
67+
return runCatching { p?.getFloat() }.getOrNull() ?: defValue
6868
}
6969

7070
fun getString(
@@ -73,7 +73,7 @@ class Config(private val data: ConfigData = ConfigData()) {
7373
): String {
7474
Timber.d("read: $path")
7575
val p = data.traverse(path)?.configValue
76-
return p?.getString() ?: defValue
76+
return runCatching { p?.getString() }.getOrNull() ?: defValue
7777
}
7878

7979
fun getItem(path: String): ConfigItem? {

0 commit comments

Comments
 (0)