Split OkHttpNetworkFetcher's fetch method to make part of it reusable

Subclasses overriding the fetch method might want to reuse some of its functionality. This change splits the fetch method to make this reusability possible.
facebook · Oct 7, 2016 · 9aa1e75 · 9aa1e75
1 parent cc2479a
commit 9aa1e75
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/...http3/src/main/java/com/facebook/imagepipeline/backends/okhttp3/OkHttpNetworkFetcher.java b/...http3/src/main/java/com/facebook/imagepipeline/backends/okhttp3/OkHttpNetworkFetcher.java
@@ -73,15 +73,8 @@ public OkHttpNetworkFetchState createFetchState(
     return new OkHttpNetworkFetchState(consumer, context);
   }
 
-  @Override
-  public void fetch(final OkHttpNetworkFetchState fetchState, final Callback callback) {
-    fetchState.submitTime = SystemClock.elapsedRealtime();
-    final Uri uri = fetchState.getUri();
-    final Request request = new Request.Builder()
-        .cacheControl(new CacheControl.Builder().noStore().build())
-        .url(uri.toString())
-        .get()
-        .build();
+  protected void fetchWithRequest(final OkHttpNetworkFetchState fetchState, final Callback callback,
+      final Request request) {
     final Call call = mOkHttpClient.newCall(request);
 
     fetchState.getContext().addCallbacks(
@@ -109,9 +102,9 @@ public void onResponse(Call call, Response response) throws IOException {
             try {
               if (!response.isSuccessful()) {
                 handleException(
-                        call,
-                        new IOException("Unexpected HTTP code " + response),
-                        callback);
+                    call,
+                    new IOException("Unexpected HTTP code " + response),
+                    callback);
                 return;
               }
 
@@ -138,6 +131,18 @@ public void onFailure(Call call, IOException e) {
         });
   }
 
+  @Override
+  public void fetch(final OkHttpNetworkFetchState fetchState, final Callback callback) {
+    fetchState.submitTime = SystemClock.elapsedRealtime();
+    final Uri uri = fetchState.getUri();
+    final Request request = new Request.Builder()
+        .cacheControl(new CacheControl.Builder().noStore().build())
+        .url(uri.toString())
+        .get()
+        .build();
+    fetchWithRequest(fetchState, callback, request);
+  }
+
   @Override
   public void onFetchCompletion(OkHttpNetworkFetchState fetchState, int byteSize) {
     fetchState.fetchCompleteTime = SystemClock.elapsedRealtime();