From 17ec32dec104b4606e0803f70392a3a939a014fe Mon Sep 17 00:00:00 2001 From: Samfun75 <38332931+Samfun75@users.noreply.github.com> Date: Tue, 22 Nov 2022 11:52:46 +0300 Subject: [PATCH] SuperStream: Fix search pagination (#1036) * SuperStream: Fix search pagination also increase read timeout to 70 seconds * SuperStream: Fix search pagination also increase read timeout to 70 seconds --- src/en/superstream/build.gradle | 2 +- .../tachiyomi/animeextension/en/superstream/SuperStream.kt | 2 +- .../tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/en/superstream/build.gradle b/src/en/superstream/build.gradle index 178b1efef..247a6d340 100644 --- a/src/en/superstream/build.gradle +++ b/src/en/superstream/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'SuperStream' pkgNameSuffix = 'en.superstream' extClass = '.SuperStream' - extVersionCode = 4 + extVersionCode = 5 libVersion = '13' } diff --git a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt index 01970658b..5f17bfe9e 100644 --- a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt +++ b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt @@ -129,7 +129,7 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() { filters: AnimeFilterList ): Observable { val searchResult = superStreamAPI.search(page, query) - return Observable.just(AnimesPage(searchResult, page < 8)) + return Observable.just(AnimesPage(searchResult, searchResult.size == 20)) } override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList) = throw Exception("not used") diff --git a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt index 542c775ea..33e360125 100644 --- a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt +++ b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt @@ -700,6 +700,7 @@ import java.security.MessageDigest import java.security.NoSuchAlgorithmException import java.security.SecureRandom import java.security.cert.X509Certificate +import java.util.concurrent.TimeUnit import javax.crypto.Cipher import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec @@ -823,7 +824,7 @@ class SuperStreamAPI(val json: Json) { key ) }","encrypt_data":"$encryptedQuery"}""" - val base64Body = String(Base64.encode(newBody.toByteArray(), Base64.DEFAULT)) + val base64Body = String(Base64.encode(newBody.toByteArray(), Base64.NO_WRAP)) val formData: RequestBody = FormBody.Builder() .add("data", base64Body) @@ -1091,6 +1092,7 @@ private fun configureToIgnoreCertificate(): OkHttpClient { return OkHttpClient.Builder() .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager) .hostnameVerifier { _, _ -> true } + .readTimeout(70, TimeUnit.SECONDS) .build() } catch (e: Exception) { throw Exception("Exception while configuring IgnoreSslCertificate: $e")