From 4342584c32287795ae5c858b0fca0e7a4bf78140 Mon Sep 17 00:00:00 2001 From: NerdNumber9 Date: Sat, 9 Jun 2018 19:54:26 -0400 Subject: [PATCH] Minor code cleanup --- .../tachiyomi/data/backup/serializer/TrackTypeAdapter.kt | 1 - .../java/eu/kanade/tachiyomi/source/online/all/EHentai.kt | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/TrackTypeAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/TrackTypeAdapter.kt index d9f3b8cac..5ed5b23d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/TrackTypeAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/TrackTypeAdapter.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.backup.serializer -import android.telecom.DisconnectCause.REMOTE import com.github.salomonbrys.kotson.typeAdapter import com.google.gson.TypeAdapter import com.google.gson.stream.JsonToken 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 31d3460c1..bf68b08c1 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 @@ -289,7 +289,7 @@ class EHentai(override val id: Long, val currentImage = getElementById("img").attr("src") //Each press of the retry button will choose another server select("#loadfail").attr("onclick").nullIfBlank()?.let { - page.url = addParam(page.url, "nl", it.substring(it.indexOf('\'') + 1 .. it.lastIndexOf('\'') - 1)) + page.url = addParam(page.url, "nl", it.substring(it.indexOf('\'') + 1 until it.lastIndexOf('\''))) } return currentImage } @@ -425,8 +425,7 @@ class EHentai(override val id: Long, } } - //Explicit type arg for listOf() to workaround this: KT-16570 - class AdvancedGroup : UriGroup>("Advanced Options", listOf>( + class AdvancedGroup : UriGroup>("Advanced Options", listOf( AdvancedOption("Search Gallery Name", "f_sname", true), AdvancedOption("Search Gallery Tags", "f_stags", true), AdvancedOption("Search Gallery Description", "f_sdesc"),