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

Fix Value X cannot be converted to json in error messages #1098

Merged
merged 1 commit into from
Jul 27, 2023
Merged

Fix Value X cannot be converted to json in error messages #1098

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
11 changes: 7 additions & 4 deletions app/src/main/java/com/jerboa/api/Http.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import okhttp3.OkHttpClient
import okhttp3.Protocol
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.ResponseBody.Companion.toResponseBody
import org.json.JSONException
import org.json.JSONObject
import retrofit2.Response
import retrofit2.Retrofit
Expand Down Expand Up @@ -395,10 +396,12 @@ fun <T> retrofitErrorHandler(res: Response<T>): T {
return res.body()!!
} else {
val errMsg = res.errorBody()?.string()?.let {
JSONObject(it).getString("error")
} ?: run {
res.code().toString()
}
try { // Prevent Could not convert to JSON messages everywhere
JSONObject(it).getString("error")
} catch (_: JSONException) {
it
}
} ?: res.code().toString()

throw Exception(errMsg)
}
Expand Down