diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index c6aac8aed..1b649bcb5 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -29,7 +29,6 @@ import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhTagDatabase import com.hippo.ehviewer.client.data.GalleryDetail import com.hippo.ehviewer.coil.MergeInterceptor -import com.hippo.ehviewer.cronet.isCronetSupported import com.hippo.ehviewer.dailycheck.checkDawn import com.hippo.ehviewer.dao.EhDatabase import com.hippo.ehviewer.download.DownloadManager @@ -50,6 +49,7 @@ import com.hippo.ehviewer.util.FavouriteStatusRouter import com.hippo.ehviewer.util.FileUtils import com.hippo.ehviewer.util.ReadableTime import com.hippo.ehviewer.util.isAtLeastQ +import com.hippo.ehviewer.util.isCronetSupported import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.withUIContext diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt index 870c54a3d..017e9c888 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt @@ -45,8 +45,8 @@ import com.hippo.ehviewer.client.parser.VoteCommentResult import com.hippo.ehviewer.client.parser.VoteTagParser import com.hippo.ehviewer.dailycheck.showEventNotification import com.hippo.ehviewer.dailycheck.today -import com.hippo.ehviewer.network.StatusCodeException import com.hippo.ehviewer.util.AppConfig +import com.hippo.ehviewer.util.StatusCodeException import kotlinx.coroutines.CancellationException import kotlinx.coroutines.delay import kotlinx.serialization.json.add 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 f4ce9d243..9a37e6129 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt @@ -26,12 +26,12 @@ 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.isCronetSupported import com.hippo.ehviewer.download.downloadLocation import com.hippo.ehviewer.gallery.SUPPORT_IMAGE_EXTENSIONS import com.hippo.ehviewer.image.Image.CloseableSource import com.hippo.ehviewer.image.rewriteGifSource2 import com.hippo.ehviewer.util.FileUtils +import com.hippo.ehviewer.util.isCronetSupported import com.hippo.ehviewer.util.sendTo import com.hippo.unifile.UniFile import com.hippo.unifile.openOutputStream diff --git a/app/src/main/java/com/hippo/ehviewer/cronet/CronetUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt similarity index 60% rename from app/src/main/java/com/hippo/ehviewer/cronet/CronetUtils.kt rename to app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt index 5a847f74d..6b1770cd2 100644 --- a/app/src/main/java/com/hippo/ehviewer/cronet/CronetUtils.kt +++ b/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt @@ -1,7 +1,6 @@ -package com.hippo.ehviewer.cronet +package com.hippo.ehviewer.util import com.hippo.ehviewer.Settings -import com.hippo.ehviewer.util.isAtLeastQ val isCronetSupported: Boolean get() = Settings.enableQuic && isAtLeastQ diff --git a/app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt index 95e20bb29..a2dccb830 100644 --- a/app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt +++ b/app/src/main/java/com/hippo/ehviewer/util/ExceptionUtils.kt @@ -17,7 +17,6 @@ package com.hippo.ehviewer.util import com.hippo.ehviewer.R import com.hippo.ehviewer.client.exception.EhException -import com.hippo.ehviewer.network.StatusCodeException import splitties.init.appCtx import java.io.IOException import java.net.MalformedURLException diff --git a/app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt b/app/src/main/java/com/hippo/ehviewer/util/StatusCodeException.kt similarity index 99% rename from app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt rename to app/src/main/java/com/hippo/ehviewer/util/StatusCodeException.kt index b9656a7a4..bd572c5cf 100644 --- a/app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt +++ b/app/src/main/java/com/hippo/ehviewer/util/StatusCodeException.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.ehviewer.network +package com.hippo.ehviewer.util import android.util.SparseArray import com.hippo.ehviewer.R