diff --git a/app/build.gradle b/app/build.gradle index 00fbf2232..66ccc78b7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,6 +70,7 @@ android { packagingOptions { resources { excludes += "/META-INF/**" + excludes += "/okhttp3/**" excludes += "/kotlin/**" excludes += "**.txt" excludes += "**.bin" diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 623ad633b..2c5acb6d3 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -125,6 +125,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; +import coil.Coil; import okhttp3.HttpUrl; import rikka.core.res.ResourcesKt; @@ -1093,28 +1094,17 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O if (-1L == gid) { return; } - File temp = AppConfig.createTempFile(); - if (null == temp) { - } - /* - OutputStream os = null; try { - os = new FileOutputStream(temp); - if (beerBelly.pullFromDiskCache(EhCacheKeyFactory.getThumbKey(gid), os)) { - ListUrlBuilder lub = new ListUrlBuilder(); - lub.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH); - lub.setImagePath(temp.getPath()); - lub.setUseSimilarityScan(true); - GalleryListScene.startScene(this, lub); - } - } catch (FileNotFoundException e) { - // Ignore - } finally { - IOUtils.closeQuietly(os); + var path = Coil.imageLoader(context).getDiskCache().get(EhCacheKeyFactory.getThumbKey(gid)).getData(); + ListUrlBuilder lub = new ListUrlBuilder(); + lub.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH); + lub.setImagePath(path.toString()); + lub.setUseSimilarityScan(true); + GalleryListScene.startScene(this, lub); + } catch (Throwable e) { + e.printStackTrace(); } - - */ } @Override diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa..e6345fd52 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ