From ead2300d9092b665327457f0d09490e201f6186d Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 27 Jul 2023 11:56:22 +0800 Subject: [PATCH] Refactor package layout --- .../java/com/hippo/ehviewer/coil/CronetHttpUriFetcher.kt | 6 +++--- .../Android14CoroutineHttpEngine.kt => cronet/CronetKt.kt} | 2 +- app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) rename app/src/main/java/com/hippo/ehviewer/{spider/Android14CoroutineHttpEngine.kt => cronet/CronetKt.kt} (99%) diff --git a/app/src/main/java/com/hippo/ehviewer/coil/CronetHttpUriFetcher.kt b/app/src/main/java/com/hippo/ehviewer/coil/CronetHttpUriFetcher.kt index b3dcba8a4..7bbb1f263 100644 --- a/app/src/main/java/com/hippo/ehviewer/coil/CronetHttpUriFetcher.kt +++ b/app/src/main/java/com/hippo/ehviewer/coil/CronetHttpUriFetcher.kt @@ -12,9 +12,9 @@ import coil.fetch.FetchResult import coil.fetch.Fetcher import coil.fetch.SourceResult import coil.request.Options -import com.hippo.ehviewer.spider.awaitBodyFully -import com.hippo.ehviewer.spider.cronetRequest -import com.hippo.ehviewer.spider.execute +import com.hippo.ehviewer.cronet.awaitBodyFully +import com.hippo.ehviewer.cronet.cronetRequest +import com.hippo.ehviewer.cronet.execute import java.io.RandomAccessFile /** diff --git a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt b/app/src/main/java/com/hippo/ehviewer/cronet/CronetKt.kt similarity index 99% rename from app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt rename to app/src/main/java/com/hippo/ehviewer/cronet/CronetKt.kt index e6daeae68..c8ef4640e 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/cronet/CronetKt.kt @@ -1,4 +1,4 @@ -package com.hippo.ehviewer.spider +package com.hippo.ehviewer.cronet import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.client.CHROME_ACCEPT diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt index dfc0424dd..a7ea0fff8 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt @@ -26,6 +26,9 @@ import com.hippo.ehviewer.client.executeNonCache import com.hippo.ehviewer.client.getImageKey import com.hippo.ehviewer.coil.read import com.hippo.ehviewer.coil.suspendEdit +import com.hippo.ehviewer.cronet.awaitBodyFully +import com.hippo.ehviewer.cronet.cronetRequest +import com.hippo.ehviewer.cronet.execute import com.hippo.ehviewer.download.downloadLocation import com.hippo.ehviewer.gallery.SUPPORT_IMAGE_EXTENSIONS import com.hippo.ehviewer.image.Image.CloseableSource