Support Disk Cache as lowest level

lugurt · Apr 6, 2015 · 9ba338e · 9ba338e
1 parent 2adb237
commit 9ba338e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/core/ProducerSequenceFactory.java b/imagepipeline/src/main/java/com/facebook/imagepipeline/core/ProducerSequenceFactory.java
@@ -112,8 +112,8 @@ private static void validateEncodedImageRequest(ImageRequest imageRequest) {
     Preconditions.checkNotNull(imageRequest);
     Preconditions.checkArgument(UriUtil.isNetworkUri(imageRequest.getSourceUri()));
     Preconditions.checkArgument(
-        imageRequest.getLowestPermittedRequestLevel() ==
-            ImageRequest.RequestLevel.FULL_FETCH);
+        imageRequest.getLowestPermittedRequestLevel().getValue() <=
+            ImageRequest.RequestLevel.ENCODED_MEMORY_CACHE.getValue());
   }
 
   /**

diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheProducer.java b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheProducer.java
@@ -60,7 +60,7 @@ public void produceResults(
       final ProducerContext producerContext) {
     ImageRequest imageRequest = producerContext.getImageRequest();
     if (!imageRequest.isDiskCacheEnabled()) {
-      mNextProducer.produceResults(consumer, producerContext);
+      maybeStartNextProducer(consumer, consumer, producerContext);
       return;
     }
 
@@ -84,7 +84,8 @@ public Void then(Task<CloseableReference<PooledByteBuffer>> task)
               consumer.onCancellation();
             } else if (task.isFaulted()) {
               listener.onProducerFinishWithFailure(requestId, PRODUCER_NAME, task.getError(), null);
-              mNextProducer.produceResults(
+              maybeStartNextProducer(
+                  consumer,
                   new DiskCacheConsumer(consumer, cache, cacheKey),
                   producerContext);
             } else {
@@ -102,7 +103,8 @@ public Void then(Task<CloseableReference<PooledByteBuffer>> task)
                     requestId,
                     PRODUCER_NAME,
                     getExtraMap(listener, requestId, false));
-                mNextProducer.produceResults(
+                maybeStartNextProducer(
+                    consumer,
                     new DiskCacheConsumer(consumer, cache, cacheKey),
                     producerContext);
               }
@@ -118,6 +120,19 @@ public Void then(Task<CloseableReference<PooledByteBuffer>> task)
     subscribeTaskForRequestCancellation(isCancelled, producerContext);
   }
 
+  private void maybeStartNextProducer(
+      Consumer<CloseableReference<PooledByteBuffer>> consumerOfDiskCacheProducer,
+      Consumer<CloseableReference<PooledByteBuffer>> consumerOfNextProducer,
+      ProducerContext producerContext) {
+    if (producerContext.getLowestPermittedRequestLevel().getValue() >=
+        ImageRequest.RequestLevel.DISK_CACHE.getValue()) {
+      consumerOfDiskCacheProducer.onNewResult(null, true);
+      return;
+    }
+
+    mNextProducer.produceResults(consumerOfNextProducer, producerContext);
+  }
+
   @VisibleForTesting
   static Map<String, String> getExtraMap(
       final ProducerListener listener,