Skip to content
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

all: safer non-string json (fixes #3260) #3265

Merged
merged 4 commits into from
Mar 18, 2024
Merged

all: safer non-string json (fixes #3260) #3265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d5c530
Update JsonUtils.kt
Okuro3499 Mar 18, 2024
56f79fc
Update JsonUtils.kt
dogi Mar 18, 2024
389fd54
Update build.gradle
dogi Mar 18, 2024
7600ca7
Merge branch 'master' into 3260-unsupportedoperationexception-jsonobject
dogi Mar 18, 2024
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
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1423
versionName "0.14.23"
versionCode 1424
versionName "0.14.24"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
10 changes: 8 additions & 2 deletions app/src/main/java/org/ole/planet/myplanet/utilities/JsonUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ object JsonUtils {
return try {
if (jsonObject?.has(fieldName) == true) {
val el: JsonElement = jsonObject.get(fieldName)
if (el is JsonNull) "" else el.asString
if (el is JsonNull) {
""
} else if (el.isJsonPrimitive && el.asJsonPrimitive.isString) {
el.asString
} else {
""
}
} else {
""
}
Expand Down Expand Up @@ -166,4 +172,4 @@ object JsonUtils {
0L
}
}
}
}