Skip to content

Commit e5e024e

Browse files
committed
fix: replace removed OkHttp internal OkHostnameVerifier with platform default
Signed-off-by: Jesus Recio <jrecio@izertis.com>
1 parent cae6619 commit e5e024e

6 files changed

Lines changed: 3 additions & 12 deletions

File tree

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ patternlockview = "a90b0d4bf0"
4545
photoView = "2.3.0"
4646
preference = "1.2.0"
4747
sonarqube = "4.0.0.2929"
48-
stetho = "1.6.0"
4948
timber = "5.0.1"
5049

5150
[libraries]
@@ -113,7 +112,6 @@ moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.re
113112
moshi-kotlin-codegen = { group = "com.squareup.moshi", name = "moshi-kotlin-codegen", version.ref = "moshi" }
114113
patternlockview = { group = "com.github.aritraroy.PatternLockView", name = "patternlockview", version.ref = "patternlockview" }
115114
photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoView" }
116-
stetho = { group = "com.facebook.stetho", name = "stetho", version.ref = "stetho" }
117115
timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
118116

119117
# Dependencies of the included build-logic

‎owncloudApp/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ dependencies {
8484
// Debug
8585
debugImplementation libs.androidx.fragment.testing
8686
debugImplementation libs.androidx.test.monitor
87-
debugImplementation libs.stetho
8887

8988
// Detekt
9089
detektPlugins libs.detekt.formatting

‎owncloudApp/src/debug/java/com/owncloud/android/utils/DebugInjector.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ package com.owncloud.android.utils
2222
import android.content.Context
2323
import android.os.Build
2424
import android.os.StrictMode
25-
import com.facebook.stetho.Stetho
2625

2726
object DebugInjector {
2827
open fun injectDebugTools(context: Context) {
29-
Stetho.initializeWithDefaults(context)
30-
3128
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
3229
StrictMode.setVmPolicy(
3330
StrictMode.VmPolicy.Builder()

‎owncloudComLibrary/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ dependencies {
2424

2525
testImplementation 'junit:junit:4.13.2'
2626
testImplementation 'org.robolectric:robolectric:4.10'
27-
debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
2827

2928
// Detekt
3029
detektPlugins libs.detekt.formatting

‎owncloudComLibrary/src/debug/java/com/owncloud/android/lib/common/http/DebugInterceptorFactory.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
package com.owncloud.android.lib.common.http
2525

26-
import com.facebook.stetho.okhttp3.StethoInterceptor
27-
2826
object DebugInterceptorFactory {
29-
fun getInterceptor() = StethoInterceptor()
27+
fun getInterceptor() = DummyInterceptor()
3028
}

‎owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/KnownServersHostnameVerifier.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.owncloud.android.lib.common.network;
2020

2121
import android.content.Context;
22-
import okhttp3.internal.tls.OkHostnameVerifier;
22+
import javax.net.ssl.HttpsURLConnection;
2323
import timber.log.Timber;
2424
import javax.net.ssl.HostnameVerifier;
2525
import javax.net.ssl.SSLPeerUnverifiedException;
@@ -33,7 +33,7 @@ public class KnownServersHostnameVerifier implements HostnameVerifier {
3333
private final HostnameVerifier mDelegate;
3434

3535
public KnownServersHostnameVerifier(Context context) {
36-
this(context, OkHostnameVerifier.INSTANCE);
36+
this(context, HttpsURLConnection.getDefaultHostnameVerifier());
3737
}
3838

3939
KnownServersHostnameVerifier(Context context, HostnameVerifier delegate) {

0 commit comments

Comments
 (0)