فهرست منبع

Upgrade okhttp

len 8 سال پیش
والد
کامیت
907472403d
2فایلهای تغییر یافته به همراه3 افزوده شده و 8 حذف شده
  1. 2 2
      app/build.gradle
  2. 1 6
      app/src/main/java/eu/kanade/tachiyomi/data/network/OkHttpExtensions.kt

+ 2 - 2
app/build.gradle

@@ -120,7 +120,7 @@ dependencies {
     compile 'com.github.pwittchen:reactivenetwork:0.6.0'
 
     // Network client
-    compile "com.squareup.okhttp3:okhttp:3.4.2"
+    compile "com.squareup.okhttp3:okhttp:3.5.0"
     compile 'com.squareup.okio:okio:1.11.0'
 
     // REST
@@ -148,7 +148,7 @@ dependencies {
 
     // Job scheduling
     compile 'com.evernote:android-job:1.1.3'
-    compile 'com.google.android.gms:play-services-gcm:10.0.0'
+    compile 'com.google.android.gms:play-services-gcm:10.0.1'
 
     // Changelog
     compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'

+ 1 - 6
app/src/main/java/eu/kanade/tachiyomi/data/network/OkHttpExtensions.kt

@@ -12,12 +12,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 fun Call.asObservable(): Observable<Response> {
     return Observable.create { subscriber ->
         // Since Call is a one-shot type, clone it for each new subscriber.
-        val call = if (!isExecuted) this else {
-            // TODO use clone method in OkHttp 3.5
-            val field = javaClass.getDeclaredField("client").apply { isAccessible = true }
-            val client = field.get(this) as OkHttpClient
-            client.newCall(request())
-        }
+        val call = clone()
 
         // Wrap the call in a helper which handles both unsubscription and backpressure.
         val requestArbiter = object : AtomicBoolean(), Producer, Subscription {