forked from recloudstream/cloudstream
bump nicehttp
This commit is contained in:
parent
a5cee36572
commit
41fd364401
5 changed files with 7 additions and 83 deletions
|
@ -190,7 +190,7 @@ dependencies {
|
||||||
// Networking
|
// Networking
|
||||||
// implementation("com.squareup.okhttp3:okhttp:4.9.2")
|
// implementation("com.squareup.okhttp3:okhttp:4.9.2")
|
||||||
// implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
|
// 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 🙏
|
// Util to skip the URI file fuckery 🙏
|
||||||
implementation("com.github.tachiyomiorg:unifile:17bec43")
|
implementation("com.github.tachiyomiorg:unifile:17bec43")
|
||||||
|
|
|
@ -1,37 +1,16 @@
|
||||||
package com.lagradost.cloudstream3.network
|
package com.lagradost.cloudstream3.network
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import com.lagradost.cloudstream3.R
|
import com.lagradost.cloudstream3.R
|
||||||
import com.lagradost.cloudstream3.USER_AGENT
|
import com.lagradost.cloudstream3.USER_AGENT
|
||||||
import com.lagradost.nicehttp.Requests
|
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.Headers.Companion.toHeaders
|
||||||
|
import okhttp3.OkHttpClient
|
||||||
import java.io.File
|
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<X509Certificate> = arrayOf()
|
|
||||||
override fun checkClientTrusted(certs: Array<X509Certificate>, authType: String) = Unit
|
|
||||||
override fun checkServerTrusted(certs: Array<X509Certificate>, authType: String) = Unit
|
|
||||||
}
|
|
||||||
|
|
||||||
val insecureSocketFactory = SSLContext.getInstance("SSL").apply {
|
|
||||||
val trustAllCerts = arrayOf<TrustManager>(naiveTrustManager)
|
|
||||||
init(null, trustAllCerts, SecureRandom())
|
|
||||||
}.socketFactory
|
|
||||||
|
|
||||||
sslSocketFactory(insecureSocketFactory, naiveTrustManager)
|
|
||||||
hostnameVerifier { _, _ -> true }
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Requests.initClient(context: Context): OkHttpClient {
|
fun Requests.initClient(context: Context): OkHttpClient {
|
||||||
val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
|
val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
|
||||||
|
|
|
@ -1155,7 +1155,7 @@ class GeneratorPlayer : FullScreenPlayer() {
|
||||||
if(timestampShowState == show) return
|
if(timestampShowState == show) return
|
||||||
timestampShowState = show
|
timestampShowState = show
|
||||||
skip_chapter_button?.apply {
|
skip_chapter_button?.apply {
|
||||||
val showWidth = 190.toPx
|
val showWidth = 170.toPx
|
||||||
val noShowWidth = 10.toPx
|
val noShowWidth = 10.toPx
|
||||||
//if((show && width == showWidth) || (!show && width == noShowWidth)) {
|
//if((show && width == showWidth) || (!show && width == noShowWidth)) {
|
||||||
// return
|
// return
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -319,6 +319,7 @@
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
|
tools:visibility="visible"
|
||||||
android:id="@+id/skip_chapter_button"
|
android:id="@+id/skip_chapter_button"
|
||||||
style="@style/NiceButton"
|
style="@style/NiceButton"
|
||||||
android:layout_width="150dp"
|
android:layout_width="150dp"
|
||||||
|
|
Loading…
Reference in a new issue