admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address some OkHttp nullability issues

Browse Source
This commit is contained in:
Jobobby04
2022-09-03 19:55:30 -04:00
parent 0c1ac913cb
commit 6e1e42fefd
10 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/md/handlers/AzukiHandler.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class AzukiHandler(currentClient: OkHttpClient, userAgent: String) {
}
fun pageListParse(response: Response): List<Page> {
return Json.parseToJsonElement(response.body!!.string())
return Json.parseToJsonElement(response.body.string())
.jsonObject["pages"]!!
.jsonArray.mapIndexed { index, element ->
val url = element.jsonObject["image_wm"]!!.jsonObject["webp"]!!.jsonArray[1].jsonObject["url"]!!.jsonPrimitive.content
app/src/main/java/exh/md/handlers/ComikeyHandler.kt
+2 -2
View File
@@ -45,7 +45,7 @@ class ComikeyHandler(cloudflareClient: OkHttpClient, userAgent: String) {
}
private fun getActualPageList(response: Response): Request? {
val element = Json.parseToJsonElement(response.body!!.string()).jsonObject
val element = Json.parseToJsonElement(response.body.string()).jsonObject
val ok = element["ok"]?.jsonPrimitive?.booleanOrNull ?: false
if (ok.not()) {
return null
@@ -55,7 +55,7 @@ class ComikeyHandler(cloudflareClient: OkHttpClient, userAgent: String) {
}
fun pageListParse(response: Response): List<Page> {
return Json.parseToJsonElement(response.body!!.string())
return Json.parseToJsonElement(response.body.string())
.jsonObject["readingOrder"]!!
.jsonArray.mapIndexed { index, element ->
val url = element.jsonObject["href"]!!.jsonPrimitive.content
app/src/main/java/exh/md/handlers/MangaHotHandler.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class MangaHotHandler(currentClient: OkHttpClient, userAgent: String) {
}
fun pageListParse(response: Response): List<Page> {
return Json.parseToJsonElement(response.body!!.string())
return Json.parseToJsonElement(response.body.string())
.jsonObject["content"]!!.jsonObject["contentUrls"]!!
.jsonArray.mapIndexed { index, element ->
val url = element.jsonPrimitive.content
app/src/main/java/exh/md/handlers/MangaPlusHandler.kt
+2 -2
View File
@@ -40,7 +40,7 @@ class MangaPlusHandler(currentClient: OkHttpClient) {
}
private fun pageListParse(response: Response): List<Page> {
val result = ProtoBuf.decodeFromByteArray<MangaPlusResponse>(response.body!!.bytes())
val result = ProtoBuf.decodeFromByteArray<MangaPlusResponse>(response.body.bytes())
if (result.success == null) {
throw Exception("error getting images")
@@ -70,7 +70,7 @@ class MangaPlusHandler(currentClient: OkHttpClient) {
val response = chain.proceed(request)
val image = decodeImage(encryptionKey, response.body!!.bytes())
val image = decodeImage(encryptionKey, response.body.bytes())
val body = image.toResponseBody("image/jpeg".toMediaTypeOrNull())
return response.newBuilder().body(body).build()
app/src/main/java/exh/recs/RecommendsPagingSource.kt
+1 -1
View File
@@ -52,7 +52,7 @@ class MyAnimeList : API("https://api.jikan.moe/v3/") {
.toString()
val response = client.newCall(GET(apiUrl)).await()
val body = withIOContext { response.body?.string() } ?: throw Exception("Null Response")
val body = withIOContext { response.body.string() }
val data = Json.decodeFromString<JsonObject>(body)
val recommendations = data["recommendations"] as? JsonArray
return recommendations?.filterIsInstance<JsonObject>()?.map { rec ->
app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
+1 -1
View File
@@ -292,7 +292,7 @@ class BrowserActionActivity : AppCompatActivity() {
token to it
}
}.flatMap { (token, response) ->
val audioFile = response.body!!.bytes()
val audioFile = response.body.bytes()
httpClient.newCall(
Request.Builder()
app/src/main/java/exh/util/OkHttpUtil.kt
+1 -2
View File
@@ -7,8 +7,7 @@ import okhttp3.ResponseBody.Companion.toResponseBody
import org.jsoup.nodes.Document
fun Response.interceptAsHtml(block: (Document) -> Unit): Response {
val body = body
return if (body?.contentType()?.type == "text" &&
return if (body.contentType()?.type == "text" &&
body.contentType()?.subtype == "html"
) {
val bodyString = body.string()