From 59085f13718c50c8933b81f9f672dd7ff2cbc8f6 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Mon, 14 Mar 2016 23:20:00 +0800
Subject: [PATCH] Use LruCache instead of LruCacheEx

---
 .../com/hippo/ehviewer/EhApplication.java     | 20 +++++++++----------
 beerbelly                                     |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index fb0e4ab92..7da7f6cd1 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -23,10 +23,10 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.os.Debug;
 import android.support.annotation.NonNull;
+import android.support.v4.util.LruCache;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.hippo.beerbelly.LruCacheEx;
 import com.hippo.beerbelly.SimpleDiskCache;
 import com.hippo.conaco.Conaco;
 import com.hippo.ehviewer.client.EhClient;
@@ -67,9 +67,9 @@ public class EhApplication extends SceneApplication implements Thread.UncaughtEx
     private OkHttpClient mOkHttpClient;
     private BitmapHelper mBitmapHelper;
     private Conaco<Bitmap> mConaco;
-    private LruCacheEx<Long, GalleryDetail> mGalleryDetailCache;
-    private LruCacheEx<String, LargePreviewSet> mLargePreviewSetCache;
-    private LruCacheEx<Long, Integer> mPreviewPagesCache;
+    private LruCache<Long, GalleryDetail> mGalleryDetailCache;
+    private LruCache<String, LargePreviewSet> mLargePreviewSetCache;
+    private LruCache<Long, Integer> mPreviewPagesCache;
     private SimpleDiskCache mSpiderInfoCache;
     private DownloadManager mDownloadManager;
 
@@ -224,31 +224,31 @@ public class EhApplication extends SceneApplication implements Thread.UncaughtEx
     }
 
     @NonNull
-    public static LruCacheEx<Long, GalleryDetail> getGalleryDetailCache(@NonNull Context context) {
+    public static LruCache<Long, GalleryDetail> getGalleryDetailCache(@NonNull Context context) {
         EhApplication application = ((EhApplication) context.getApplicationContext());
         if (application.mGalleryDetailCache == null) {
             // Max size 25, 3 min timeout
-            application.mGalleryDetailCache = new LruCacheEx<>(25,  3 * 60 * 1000);
+            application.mGalleryDetailCache = new LruCache<>(25);
         }
         return application.mGalleryDetailCache;
     }
 
     @NonNull
-    public static LruCacheEx<String, LargePreviewSet> getLargePreviewSetCache(@NonNull Context context) {
+    public static LruCache<String, LargePreviewSet> getLargePreviewSetCache(@NonNull Context context) {
         EhApplication application = ((EhApplication) context.getApplicationContext());
         if (application.mLargePreviewSetCache == null) {
             // Max size 50, 3 min timeout
-            application.mLargePreviewSetCache = new LruCacheEx<>(50,  3 * 60 * 1000);
+            application.mLargePreviewSetCache = new LruCache<>(50);
         }
         return application.mLargePreviewSetCache;
     }
 
     @NonNull
-    public static LruCacheEx<Long, Integer> getPreviewPagesCache(@NonNull Context context) {
+    public static LruCache<Long, Integer> getPreviewPagesCache(@NonNull Context context) {
         EhApplication application = ((EhApplication) context.getApplicationContext());
         if (application.mPreviewPagesCache == null) {
             // Max size 50, 3 min timeout
-            application.mPreviewPagesCache = new LruCacheEx<>(50,  3 * 60 * 1000);
+            application.mPreviewPagesCache = new LruCache<>(50);
         }
         return application.mPreviewPagesCache;
     }
diff --git a/beerbelly b/beerbelly
index 266f6590a..16a850c53 160000
--- a/beerbelly
+++ b/beerbelly
@@ -1 +1 @@
-Subproject commit 266f6590a900cf2e4894d050009c442b6deabe6c
+Subproject commit 16a850c533f009e49e69244d7f67305f54302099