From 41fd3644012de90896ec156ab852fba49791c51b Mon Sep 17 00:00:00 2001 From: reduplicated <110570621+reduplicated@users.noreply.github.com> Date: Fri, 4 Nov 2022 19:57:12 +0100 Subject: [PATCH] bump nicehttp --- app/build.gradle.kts | 2 +- .../cloudstream3/network/RequestsHelper.kt | 29 ++-------- .../cloudstream3/ui/player/GeneratorPlayer.kt | 2 +- .../cloudstream3/widget/TopCropImageView.kt | 56 ------------------- .../main/res/layout/player_custom_layout.xml | 1 + 5 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/widget/TopCropImageView.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7c77de39..df50d843 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -190,7 +190,7 @@ dependencies { // Networking // implementation("com.squareup.okhttp3:okhttp:4.9.2") // implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1") - implementation("com.github.Blatzar:NiceHttp:0.3.3") + implementation("com.github.Blatzar:NiceHttp:0.3.4") // Util to skip the URI file fuckery 🙏 implementation("com.github.tachiyomiorg:unifile:17bec43") diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt index 50389291..8bf1f91b 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt @@ -1,37 +1,16 @@ package com.lagradost.cloudstream3.network -import android.annotation.SuppressLint import android.content.Context import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.USER_AGENT import com.lagradost.nicehttp.Requests -import okhttp3.* +import com.lagradost.nicehttp.ignoreAllSSLErrors +import okhttp3.Cache +import okhttp3.Headers import okhttp3.Headers.Companion.toHeaders +import okhttp3.OkHttpClient import java.io.File -import java.security.SecureRandom -import java.security.cert.X509Certificate -import javax.net.ssl.SSLContext -import javax.net.ssl.TrustManager -import javax.net.ssl.X509TrustManager - -fun OkHttpClient.Builder.ignoreAllSSLErrors(): OkHttpClient.Builder { - val naiveTrustManager = @SuppressLint("CustomX509TrustManager") - object : X509TrustManager { - override fun getAcceptedIssuers(): Array = arrayOf() - override fun checkClientTrusted(certs: Array, authType: String) = Unit - override fun checkServerTrusted(certs: Array, authType: String) = Unit - } - - val insecureSocketFactory = SSLContext.getInstance("SSL").apply { - val trustAllCerts = arrayOf(naiveTrustManager) - init(null, trustAllCerts, SecureRandom()) - }.socketFactory - - sslSocketFactory(insecureSocketFactory, naiveTrustManager) - hostnameVerifier { _, _ -> true } - return this -} fun Requests.initClient(context: Context): OkHttpClient { val settingsManager = PreferenceManager.getDefaultSharedPreferences(context) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt index 450711fa..16c5c3ce 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt @@ -1155,7 +1155,7 @@ class GeneratorPlayer : FullScreenPlayer() { if(timestampShowState == show) return timestampShowState = show skip_chapter_button?.apply { - val showWidth = 190.toPx + val showWidth = 170.toPx val noShowWidth = 10.toPx //if((show && width == showWidth) || (!show && width == noShowWidth)) { // return diff --git a/app/src/main/java/com/lagradost/cloudstream3/widget/TopCropImageView.kt b/app/src/main/java/com/lagradost/cloudstream3/widget/TopCropImageView.kt deleted file mode 100644 index 11ac0160..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/widget/TopCropImageView.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.lagradost.cloudstream3.widget - -import android.content.Context -import android.graphics.Matrix -import android.graphics.drawable.Drawable -import android.util.AttributeSet - -// taken from https://gist.github.com/arriolac/3843346 -class TopCropImageView : androidx.appcompat.widget.AppCompatImageView { - constructor(context: Context) : super(context) { - init() - } - - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { - init() - } - - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super( - context, - attrs, - defStyleAttr - ) { - init() - } - - override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { - super.onLayout(changed, left, top, right, bottom) - recomputeImgMatrix() - } - - override fun setFrame(l: Int, t: Int, r: Int, b: Int): Boolean { - recomputeImgMatrix() - return super.setFrame(l, t, r, b) - } - - private fun init() { - scaleType = ScaleType.MATRIX - } - - private fun recomputeImgMatrix() { - val drawable: Drawable = drawable ?: return - val matrix: Matrix = imageMatrix - val scale: Float - val viewWidth: Int = width - paddingLeft - paddingRight - val viewHeight: Int = height - paddingTop - paddingBottom - val drawableWidth: Int = drawable.intrinsicWidth - val drawableHeight: Int = drawable.intrinsicHeight - scale = if (drawableWidth * viewHeight > drawableHeight * viewWidth) { - viewHeight.toFloat() / drawableHeight.toFloat() - } else { - viewWidth.toFloat() / drawableWidth.toFloat() - } - matrix.setScale(scale, scale) - imageMatrix = matrix - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml index 95bf3b3e..2cdcbf22 100644 --- a/app/src/main/res/layout/player_custom_layout.xml +++ b/app/src/main/res/layout/player_custom_layout.xml @@ -319,6 +319,7 @@