Improve OkHttpStreamFetcher

arms/src/main/java/com/jess/arms/http/OkHttpStreamFetcher.java

@@ -15,7 +15,6 @@
  */
 package com.jess.arms.http;
 
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
@@ -25,7 +24,7 @@ import com.bumptech.glide.load.HttpException;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.util.ContentLengthInputStream;
-import com.bumptech.glide.util.Synthetic;
+import com.bumptech.glide.util.Preconditions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,23 +38,27 @@ import okhttp3.ResponseBody;
 /**
  * Fetches an {@link InputStream} using the okhttp library.
  */
-public class OkHttpStreamFetcher implements DataFetcher<InputStream>,
-        okhttp3.Callback {
+public class OkHttpStreamFetcher implements DataFetcher<InputStream>, okhttp3.Callback {
     private static final String TAG = "OkHttpFetcher";
     private final Call.Factory client;
     private final GlideUrl url;
-    @Synthetic InputStream stream;
-    @Synthetic ResponseBody responseBody;
-    private volatile Call call;
+    private InputStream stream;
+    private ResponseBody responseBody;
     private DataCallback<? super InputStream> callback;
+    // call may be accessed on the main thread while the object is in use on other threads. All other
+    // accesses to variables may occur on different threads, but only one at a time.
+    private volatile Call call;
 
+    // Public API.
+    @SuppressWarnings("WeakerAccess")
     public OkHttpStreamFetcher(Call.Factory client, GlideUrl url) {
         this.client = client;
         this.url = url;
     }
 
     @Override
-    public void loadData(Priority priority, final DataCallback<? super InputStream> callback) {
+    public void loadData(@NonNull Priority priority,
+                         @NonNull final DataCallback<? super InputStream> callback) {
         Request.Builder requestBuilder = new Request.Builder().url(url.toStringUrl());
         for (Map.Entry<String, String> headerEntry : url.getHeaders().entrySet()) {
             String key = headerEntry.getKey();
@@ -65,25 +68,11 @@ public class OkHttpStreamFetcher implements DataFetcher<InputStream>,
         this.callback = callback;
 
         call = client.newCall(request);
-        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
-            call.enqueue(this);
-        } else {
-            try {
-                // Calling execute instead of enqueue is a workaround for #2355, where okhttp throws a
-                // ClassCastException on O.
-                onResponse(call, call.execute());
-            } catch (IOException e) {
-                onFailure(call, e);
-            } catch (ClassCastException e) {
-                // It's not clear that this catch is necessary, the error may only occur even on O if
-                // enqueue is used.
-                onFailure(call, new IOException("Workaround for framework bug on O", e));
-            }
-        }
+        call.enqueue(this);
     }
 
     @Override
-    public void onFailure(Call call, IOException e) {
+    public void onFailure(@NonNull Call call, @NonNull IOException e) {
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log.d(TAG, "OkHttp failed to obtain result", e);
         }
@@ -92,10 +81,10 @@ public class OkHttpStreamFetcher implements DataFetcher<InputStream>,
     }
 
     @Override
-    public void onResponse(Call call, Response response) throws IOException {
+    public void onResponse(@NonNull Call call, @NonNull Response response) {
         responseBody = response.body();
         if (response.isSuccessful()) {
-            long contentLength = responseBody.contentLength();
+            long contentLength = Preconditions.checkNotNull(responseBody).contentLength();
             stream = ContentLengthInputStream.obtain(responseBody.byteStream(), contentLength);
             callback.onDataReady(stream);
         } else {
@@ -137,5 +126,4 @@ public class OkHttpStreamFetcher implements DataFetcher<InputStream>,
     public DataSource getDataSource() {
         return DataSource.REMOTE;
     }
-}
-
+}
\ No newline at end of file