mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-11 06:44:09 +01:00
Revert to older okhttp
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
281692519a
commit
6436c6b6ac
@ -90,6 +90,10 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
|
||||||
|
}
|
||||||
|
|
||||||
dexOptions {
|
dexOptions {
|
||||||
javaMaxHeapSize "4g"
|
javaMaxHeapSize "4g"
|
||||||
}
|
}
|
||||||
@ -250,9 +254,9 @@ dependencies {
|
|||||||
implementation 'com.bluelinelabs:conductor-autodispose:3.0.0-rc2'
|
implementation 'com.bluelinelabs:conductor-autodispose:3.0.0-rc2'
|
||||||
implementation "com.github.miquelbeltran:conductor-viewmodel:1.0.3"
|
implementation "com.github.miquelbeltran:conductor-viewmodel:1.0.3"
|
||||||
|
|
||||||
implementation 'com.squareup.okhttp3:okhttp:4.2.2'
|
implementation 'com.squareup.okhttp3:okhttp:3.14.2'
|
||||||
implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.2.2'
|
implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.14.2'
|
||||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
|
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2'
|
||||||
|
|
||||||
implementation 'com.squareup.retrofit2:retrofit:2.6.2'
|
implementation 'com.squareup.retrofit2:retrofit:2.6.2'
|
||||||
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.2'
|
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.2'
|
||||||
|
@ -1138,7 +1138,7 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter
|
|||||||
timeout: Int
|
timeout: Int
|
||||||
) {
|
) {
|
||||||
val xChatLastGivenHeader: String? = response.headers().get("X-Chat-Last-Given")
|
val xChatLastGivenHeader: String? = response.headers().get("X-Chat-Last-Given")
|
||||||
if (response.headers().size > 0 && !TextUtils.isEmpty(xChatLastGivenHeader)) {
|
if (response.headers().size() > 0 && !TextUtils.isEmpty(xChatLastGivenHeader)) {
|
||||||
|
|
||||||
val header = Integer.parseInt(xChatLastGivenHeader!!)
|
val header = Integer.parseInt(xChatLastGivenHeader!!)
|
||||||
if (header > 0) {
|
if (header > 0) {
|
||||||
|
@ -117,7 +117,7 @@ fun createOkHttpClient(
|
|||||||
// Trust own CA and all self-signed certs
|
// Trust own CA and all self-signed certs
|
||||||
httpClient.sslSocketFactory(sslSocketFactoryCompat, magicTrustManager)
|
httpClient.sslSocketFactory(sslSocketFactoryCompat, magicTrustManager)
|
||||||
httpClient.retryOnConnectionFailure(true)
|
httpClient.retryOnConnectionFailure(true)
|
||||||
httpClient.hostnameVerifier(magicTrustManager.getHostnameVerifier(OkHostnameVerifier))
|
httpClient.hostnameVerifier(magicTrustManager.getHostnameVerifier(OkHostnameVerifier.INSTANCE))
|
||||||
|
|
||||||
httpClient.dispatcher(dispatcher)
|
httpClient.dispatcher(dispatcher)
|
||||||
if (Proxy.NO_PROXY != proxy) {
|
if (Proxy.NO_PROXY != proxy) {
|
||||||
|
@ -45,14 +45,14 @@ class NetworkUtils {
|
|||||||
.header("User-Agent", ApiUtils.getUserAgent())
|
.header("User-Agent", ApiUtils.getUserAgent())
|
||||||
.header("Accept", "application/json")
|
.header("Accept", "application/json")
|
||||||
.header("OCS-APIRequest", "true")
|
.header("OCS-APIRequest", "true")
|
||||||
.method(original.method, original.body)
|
.method(original.method(), original.body())
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
val response = chain.proceed(request)
|
val response = chain.proceed(request)
|
||||||
|
|
||||||
if (request.url.encodedPath.contains("/avatar/")) {
|
if (request.url().encodedPath().contains("/avatar/")) {
|
||||||
AvatarStatusCodeHolder.getInstance()
|
AvatarStatusCodeHolder.getInstance()
|
||||||
.statusCode = response.code
|
.statusCode = response.code()
|
||||||
}
|
}
|
||||||
|
|
||||||
return response
|
return response
|
||||||
@ -68,7 +68,7 @@ class NetworkUtils {
|
|||||||
route: Route?,
|
route: Route?,
|
||||||
response: Response
|
response: Response
|
||||||
): Request? {
|
): Request? {
|
||||||
if (response.request.header(authenticatorType) != null) {
|
if (response.request().header(authenticatorType) != null) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,13 +77,13 @@ class NetworkUtils {
|
|||||||
var attemptsCount = 0
|
var attemptsCount = 0
|
||||||
|
|
||||||
|
|
||||||
while ({ countedResponse = countedResponse?.priorResponse; countedResponse }() != null) {
|
while ({ countedResponse = countedResponse?.priorResponse(); countedResponse }() != null) {
|
||||||
attemptsCount++
|
attemptsCount++
|
||||||
if (attemptsCount == 3) {
|
if (attemptsCount == 3) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return response.request
|
return response.request()
|
||||||
.newBuilder()
|
.newBuilder()
|
||||||
.header(authenticatorType, credentials)
|
.header(authenticatorType, credentials)
|
||||||
.build()
|
.build()
|
||||||
|
Loading…
Reference in New Issue
Block a user