From c9a10d90337e00af7d1685f2ceea84d2bf2d7c84 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Tue, 5 May 2020 14:27:28 -0400 Subject: [PATCH] Update build.grade and lint fixes --- .../kanade/tachiyomi/source/online/all/EHentai.kt | 14 +++++++------- .../ui/browse/source/browse/SourceFilterSheet.kt | 2 +- build.gradle.kts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index f32f83a67..c411bf8c1 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -55,7 +55,7 @@ import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request -import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -209,7 +209,7 @@ class EHentai( d.select("#gdd .gdt1").find { el -> el.text().toLowerCase() == "posted:" }!!.nextElementSibling().text() - ).time + )!!.time } // Build and append the rest of the galleries if (DebugToggles.INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS.enabled) listOf(self) @@ -222,7 +222,7 @@ class EHentai( this.url = EHentaiSearchMetadata.normalizeUrl(link) this.name = "v${index + 2}: $name" this.chapter_number = index + 2f - this.date_upload = EX_DATE_FORMAT.parse(posted).time + this.date_upload = EX_DATE_FORMAT.parse(posted)!!.time } }.reversed() + self } @@ -429,7 +429,7 @@ class EHentai( left.removeSuffix(":") .toLowerCase() ) { - "posted" -> datePosted = EX_DATE_FORMAT.parse(right).time + "posted" -> datePosted = EX_DATE_FORMAT.parse(right)!!.time // Example gallery with parent: https://e-hentai.org/g/1390451/7f181c2426/ // Example JP gallery: https://exhentai.org/g/1375385/03519d541b/ // Parent is older variation of the gallery @@ -601,7 +601,7 @@ class EHentai( fun cookiesHeader(sp: Int = spPref().getOrDefault()) = buildCookies(rawCookies(sp)) // Headers - override fun headersBuilder() = super.headersBuilder().add("Cookie", cookiesHeader())!! + override fun headersBuilder() = super.headersBuilder().add("Cookie", cookiesHeader()) fun addParam(url: String, param: String, value: String) = Uri.parse(url) .buildUpon() @@ -619,7 +619,7 @@ class EHentai( .build() chain.proceed(newReq) - }.build()!! + }.build() // Filters override fun getFilterList() = FilterList( @@ -782,7 +782,7 @@ class EHentai( client.newCall( Request.Builder() .url(EH_API_BASE) - .post(RequestBody.create(JSON, json.toString())) + .post(json.toString().toRequestBody(JSON)) .build() ).execute().body!!.string() ).obj diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt index 24e7580bc..9adf600d7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt @@ -31,7 +31,7 @@ class SourceFilterSheet( // EXH --> onSaveClicked: () -> Unit, var onSavedSearchClicked: (Int) -> Unit = {}, - var onSavedSearchDeleteClicked: (Int, String) -> Unit = { index, name -> } + var onSavedSearchDeleteClicked: (Int, String) -> Unit = { _, _ -> } // EXH <-- ) : BottomSheetDialog(activity) { diff --git a/build.gradle.kts b/build.gradle.kts index 689f29cbe..aee5d3c75 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,7 @@ buildscript { classpath("com.google.gms:google-services:4.3.3") classpath("com.google.android.gms:oss-licenses-plugin:0.10.2") // Realm (EH) - classpath("io.realm:realm-gradle-plugin:5.13.1") + classpath("io.realm:realm-gradle-plugin:6.0.2") // Firebase (EH) classpath("io.fabric.tools:gradle:1.31.0")