From 1749666720401ff129212631886c4af7531e6584 Mon Sep 17 00:00:00 2001
From: DreamPiggy <lizhuoli1126@126.com>
Date: Fri, 26 Jan 2018 23:38:23 +0800
Subject: [PATCH] Revert that SDImageCacheQueryMemoryOnly because it's
 misunderstanding. Use `imageFromMemoryCacheForKey` instead

---
 SDWebImage/SDImageCache.h      | 8 ++------
 SDWebImage/SDImageCache.m      | 2 +-
 SDWebImage/SDWebImageManager.h | 2 +-
 SDWebImage/SDWebImageManager.m | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/SDWebImage/SDImageCache.h b/SDWebImage/SDImageCache.h
index 6003595a..216151d7 100644
--- a/SDWebImage/SDImageCache.h
+++ b/SDWebImage/SDImageCache.h
@@ -26,18 +26,14 @@ typedef NS_ENUM(NSInteger, SDImageCacheType) {
 };
 
 typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
-    /**
-     * By default, we will query disk cache if the memory cache missed. This mask can force to query memory cache only without disk data.
-     */
-    SDImageCacheQueryMemoryOnly = 1 << 0,
     /**
      * By default, we do not query disk data when the image is cached in memory. This mask can force to query disk data at the same time.
      */
-    SDImageCacheQueryDataWhenInMemory = 1 << 1,
+    SDImageCacheQueryDataWhenInMemory = 1 << 0,
     /**
      * By default, we query the memory cache synchronously, disk cache asynchronously. This mask can force to query disk cache synchronously.
      */
-    SDImageCacheQueryDiskSync = 1 << 2
+    SDImageCacheQueryDiskSync = 1 << 1
 };
 
 typedef void(^SDCacheQueryCompletedBlock)(UIImage * _Nullable image, NSData * _Nullable data, SDImageCacheType cacheType);
diff --git a/SDWebImage/SDImageCache.m b/SDWebImage/SDImageCache.m
index 162122fb..54bc006d 100644
--- a/SDWebImage/SDImageCache.m
+++ b/SDWebImage/SDImageCache.m
@@ -377,7 +377,7 @@ FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) {
     
     // First check the in-memory cache...
     UIImage *image = [self imageFromMemoryCacheForKey:key];
-    BOOL shouldQueryMemoryOnly = (options & SDImageCacheQueryMemoryOnly) || (image && !(options & SDImageCacheQueryDataWhenInMemory));
+    BOOL shouldQueryMemoryOnly = (image && !(options & SDImageCacheQueryDataWhenInMemory));
     if (shouldQueryMemoryOnly) {
         if (doneBlock) {
             doneBlock(image, nil, SDImageCacheTypeMemory);
diff --git a/SDWebImage/SDWebImageManager.h b/SDWebImage/SDWebImageManager.h
index 6c83529b..508042ec 100644
--- a/SDWebImage/SDWebImageManager.h
+++ b/SDWebImage/SDWebImageManager.h
@@ -25,7 +25,7 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) {
     SDWebImageLowPriority = 1 << 1,
 
     /**
-     * This flag disables on-disk caching, including cache query and cache storing
+     * This flag disables on-disk caching after the download finished, only cache in memory
      */
     SDWebImageCacheMemoryOnly = 1 << 2,
 
diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m
index b15e5e7c..674b88ca 100644
--- a/SDWebImage/SDWebImageManager.m
+++ b/SDWebImage/SDWebImageManager.m
@@ -146,7 +146,6 @@
     NSString *key = [self cacheKeyForURL:url];
     
     SDImageCacheOptions cacheOptions = 0;
-    if (options & SDWebImageCacheMemoryOnly) cacheOptions |= SDImageCacheQueryMemoryOnly;
     if (options & SDWebImageQueryDataWhenInMemory) cacheOptions |= SDImageCacheQueryDataWhenInMemory;
     if (options & SDWebImageQueryDiskSync) cacheOptions |= SDImageCacheQueryDiskSync;