From d595a5ef8293de72c2195cbcba5dd1e6bee58a5f Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 14 Oct 2022 18:26:58 -0400 Subject: [PATCH] Minor cleanup --- .../eu/kanade/domain/UnsortedPreferences.kt | 2 - .../exh/md/service/MangaDexAuthService.kt | 3 +- .../java/exh/md/service/MangaDexService.kt | 16 ++----- .../exh/ui/captcha/BrowserActionActivity.kt | 46 +++++++++---------- 4 files changed, 28 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt b/app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt index 457b245e6..1032dcea9 100644 --- a/app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt +++ b/app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt @@ -79,8 +79,6 @@ class UnsortedPreferences( "false,false,false,false,false,false,false,false,false,false", ) - fun sourceSorting() = preferenceStore.getInt("sources_sort", 0) - fun enhancedEHentaiView() = preferenceStore.getBoolean("enhanced_e_hentai_view", true) fun preferredMangaDexId() = preferenceStore.getString("preferred_mangaDex_id", "0") diff --git a/app/src/main/java/exh/md/service/MangaDexAuthService.kt b/app/src/main/java/exh/md/service/MangaDexAuthService.kt index 1447fbdff..155486bcf 100644 --- a/app/src/main/java/exh/md/service/MangaDexAuthService.kt +++ b/app/src/main/java/exh/md/service/MangaDexAuthService.kt @@ -223,8 +223,7 @@ class MangaDexAuthService( addQueryParameter("manga[]", it) } } - .build() - .toString(), + .build(), getHeaders(), cache = CacheControl.FORCE_NETWORK, ), diff --git a/app/src/main/java/exh/md/service/MangaDexService.kt b/app/src/main/java/exh/md/service/MangaDexService.kt index cd3c89eb7..af7d2584f 100644 --- a/app/src/main/java/exh/md/service/MangaDexService.kt +++ b/app/src/main/java/exh/md/service/MangaDexService.kt @@ -42,8 +42,7 @@ class MangaDexService( addQueryParameter("ids[]", it) } } - .build() - .toString(), + .build(), cache = CacheControl.FORCE_NETWORK, ), ).await().parseAs(MdUtil.jsonParser) @@ -62,8 +61,7 @@ class MangaDexService( addQueryParameter("includes[]", MdConstants.Types.author) addQueryParameter("includes[]", MdConstants.Types.artist) } - .build() - .toString(), + .build(), cache = CacheControl.FORCE_NETWORK, ), ).await().parseAs(MdUtil.jsonParser) @@ -81,8 +79,7 @@ class MangaDexService( addQueryParameter("manga[]", id) } } - .build() - .toString(), + .build(), cache = CacheControl.FORCE_NETWORK, ), ).await().parseAs(MdUtil.jsonParser) @@ -101,8 +98,7 @@ class MangaDexService( addPathSegment("aggregate") addQueryParameter("translatedLanguage[]", translatedLanguage) } - .build() - .toString(), + .build(), cache = CacheControl.FORCE_NETWORK, ), ).await().parseAs(MdUtil.jsonParser) @@ -140,7 +136,6 @@ class MangaDexService( } } .build() - .toString() return client.newCall( GET( @@ -189,8 +184,7 @@ class MangaDexService( addPathSegment(id) addPathSegment("relation") } - .build() - .toString(), + .build(), cache = CacheControl.FORCE_NETWORK, ), ).await().parseAs(MdUtil.jsonParser) diff --git a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt index ddce88785..cfb5cbd17 100644 --- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt +++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt @@ -16,6 +16,7 @@ import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EhActivityCaptchaBinding import eu.kanade.tachiyomi.network.NetworkHelper +import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.parseAs import eu.kanade.tachiyomi.source.Source @@ -33,7 +34,7 @@ import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull +import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.Request @@ -301,29 +302,26 @@ class BrowserActionActivity : AppCompatActivity() { val audioFile = response.body.bytes() httpClient.newCall( - Request.Builder() - .url( - "https://stream.watsonplatform.net/speech-to-text/api/v1/recognize".toHttpUrlOrNull()!! - .newBuilder() - .addQueryParameter("watson-token", token) - .build(), - ) - .post( - MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addFormDataPart("jsonDescription", RECOGNIZE_JSON) - .addFormDataPart( - "audio.mp3", - "audio.mp3", - audioFile.toRequestBody( - "audio/mp3".toMediaTypeOrNull(), - 0, - audioFile.size, - ), - ) - .build(), - ) - .build(), + POST( + "https://stream.watsonplatform.net/speech-to-text/api/v1/recognize".toHttpUrl() + .newBuilder() + .addQueryParameter("watson-token", token) + .build() + .toString(), + body = MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart("jsonDescription", RECOGNIZE_JSON) + .addFormDataPart( + "audio.mp3", + "audio.mp3", + audioFile.toRequestBody( + "audio/mp3".toMediaTypeOrNull(), + 0, + audioFile.size, + ), + ) + .build(), + ), ).asObservableSuccess() }.map { response -> response.parseAs()["results"]!!