From d348343c8a5644943aee90e72a78191b652fef49 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: Sun, 1 Sep 2024 07:35:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/donut/mixfile/App.kt    | 25 +------------------
 .../mixfile/server/utils/bean/MixFile.kt      |  8 ------
 .../java/com/donut/mixfile/util/CacheUtil.kt  | 17 -------------
 3 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 app/src/main/java/com/donut/mixfile/util/CacheUtil.kt

diff --git a/app/src/main/java/com/donut/mixfile/App.kt b/app/src/main/java/com/donut/mixfile/App.kt
index 7301188..7624a58 100644
--- a/app/src/main/java/com/donut/mixfile/App.kt
+++ b/app/src/main/java/com/donut/mixfile/App.kt
@@ -6,15 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Looper
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Text
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.GifDecoder
@@ -22,15 +13,11 @@ import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
 import coil.decode.VideoFrameDecoder
 import com.donut.mixfile.server.FileService
-import com.donut.mixfile.ui.component.common.MixDialogBuilder
-import com.donut.mixfile.util.copyToClipboard
 import com.donut.mixfile.util.objects.MixActivity
 import com.donut.mixfile.util.showError
 import com.donut.mixfile.util.showErrorDialog
 import com.tencent.mmkv.MMKV
 import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 
 
@@ -38,8 +25,6 @@ val appScope by lazy { MainScope() }
 
 lateinit var kv: MMKV
 
-lateinit var cacheKv: MMKV
-
 private lateinit var innerApp: Application
 
 
@@ -60,19 +45,11 @@ class App : Application(), ImageLoaderFactory {
             if (Looper.myLooper() == null) {
                 return@setDefaultUncaughtExceptionHandler
             }
-           showErrorDialog(e)
+            showErrorDialog(e)
         }
         innerApp = this
         MMKV.initialize(this)
         kv = MMKV.defaultMMKV()
-        cacheKv = MMKV.mmkvWithID("cache", app.cacheDir.absolutePath)
-        cacheKv.enableAutoKeyExpire(MMKV.ExpireInMinute)
-        appScope.launch {
-            while (true) {
-                cacheKv.allNonExpireKeys()
-                delay(1000 * 60)
-            }
-        }
         startService(Intent(this, FileService::class.java))
     }
 
diff --git a/app/src/main/java/com/donut/mixfile/server/utils/bean/MixFile.kt b/app/src/main/java/com/donut/mixfile/server/utils/bean/MixFile.kt
index de66dd7..3fd4e16 100644
--- a/app/src/main/java/com/donut/mixfile/server/utils/bean/MixFile.kt
+++ b/app/src/main/java/com/donut/mixfile/server/utils/bean/MixFile.kt
@@ -5,7 +5,6 @@ import com.donut.mixfile.server.Uploader
 import com.donut.mixfile.server.uploadClient
 import com.donut.mixfile.ui.routes.getLocalServerAddress
 import com.donut.mixfile.ui.routes.serverAddress
-import com.donut.mixfile.util.CacheUtil
 import com.donut.mixfile.util.basen.BigIntBaseN
 import com.donut.mixfile.util.compressGzip
 import com.donut.mixfile.util.decompressGzip
@@ -90,10 +89,6 @@ data class MixShareInfo(
 
     suspend fun fetchFile(url: String): ByteArray? {
         val transformedUrl = Uploader.transformUrl(url)
-        val cachedFileData = CacheUtil.get(transformedUrl)
-        if (cachedFileData != null) {
-            return cachedFileData
-        }
         val transformedReferer = Uploader.transformReferer(referer)
         val result: ByteArray? = uploadClient.prepareGet(transformedUrl) {
             if (transformedReferer.trim().isNotEmpty()) {
@@ -104,9 +99,6 @@ data class MixShareInfo(
             channel.discard(headSize.toLong())
             decryptAES(channel, ENCODER.decode(key))
         }
-        if (result != null) {
-            CacheUtil.put(transformedUrl, result)
-        }
         return result
     }
 
diff --git a/app/src/main/java/com/donut/mixfile/util/CacheUtil.kt b/app/src/main/java/com/donut/mixfile/util/CacheUtil.kt
deleted file mode 100644
index 7a6e0a5..0000000
--- a/app/src/main/java/com/donut/mixfile/util/CacheUtil.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.donut.mixfile.util
-
-import com.donut.mixfile.cacheKv
-import com.tencent.mmkv.MMKV
-
-object CacheUtil {
-
-    fun get(key: String): ByteArray? {
-        return cacheKv.getBytes(key, null)
-    }
-
-    fun put(key: String, value: ByteArray, duration: Int = MMKV.ExpireInMinute) {
-        cacheKv.putBytes(key, value, duration)
-    }
-
-
-}
\ No newline at end of file