update core version

app/build.gradle.kts

@@ -67,7 +67,6 @@ android {
 dependencies {
     implementation(libs.mixfile.core)
     implementation(libs.androidx.material.icons.extended)
-    implementation(libs.fastjson2.kotlin)
     implementation(libs.mmkv)
     implementation(libs.zoomable)
     implementation(libs.coil)

app/src/main/java/com/donut/mixfile/server/FileService.kt

@@ -11,7 +11,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.core.app.NotificationCompat
-import com.alibaba.fastjson2.toJSONString
 import com.donut.mixfile.MainActivity
 import com.donut.mixfile.R
 import com.donut.mixfile.appScope
@@ -22,6 +21,7 @@ import com.donut.mixfile.server.core.routes.api.webdav.objects.WebDavManager
 import com.donut.mixfile.server.core.utils.MixUploadTask
 import com.donut.mixfile.server.core.utils.extensions.kb
 import com.donut.mixfile.server.core.utils.ignoreError
+import com.donut.mixfile.server.core.utils.toJsonString
 import com.donut.mixfile.server.image.createBlankBitmap
 import com.donut.mixfile.server.image.toGif
 import com.donut.mixfile.ui.routes.favorites.result
@@ -108,9 +108,9 @@ val mixFileServer = object : MixFileServer(
     override suspend fun getFileHistory(): String {
         return withContext(Dispatchers.Main) {
             if (result.isEmpty()) {
-                return@withContext favorites.asReversed().take(1000).toJSONString()
+                return@withContext favorites.asReversed().take(1000).toJsonString()
             }
-            result.take(1000).toJSONString()
+            result.take(1000).toJsonString()
         }
     }
 

app/src/main/java/com/donut/mixfile/ui/routes/Settings.kt

@@ -44,7 +44,6 @@ import com.donut.mixfile.server.UPLOADERS
 import com.donut.mixfile.server.UPLOAD_RETRY_COUNT
 import com.donut.mixfile.server.UPLOAD_TASK_COUNT
 import com.donut.mixfile.server.core.Uploader
-import com.donut.mixfile.server.core.uploaders.A1Uploader
 import com.donut.mixfile.server.currentUploader
 import com.donut.mixfile.server.getCurrentUploader
 import com.donut.mixfile.ui.component.common.CommonSwitch

app/src/main/java/com/donut/mixfile/ui/routes/webdav/Dialogs.kt

@@ -16,7 +16,8 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.donut.mixfile.kv
 import com.donut.mixfile.server.WEB_DAV_KEY
-import com.donut.mixfile.server.core.routes.api.webdav.objects.WebDavFile
+import com.donut.mixfile.server.core.objects.WebDavFile
+
 import com.donut.mixfile.server.core.routes.api.webdav.objects.WebDavManager
 import com.donut.mixfile.server.core.utils.resolveMixShareInfo
 import com.donut.mixfile.server.mixFileServer

app/src/main/java/com/donut/mixfile/util/CachedMutableValue.kt

@@ -3,10 +3,10 @@ package com.donut.mixfile.util
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.setValue
-import com.alibaba.fastjson2.into
-import com.alibaba.fastjson2.toJSONString
 import com.donut.mixfile.appScope
 import com.donut.mixfile.kv
+import com.donut.mixfile.server.core.utils.parseJsonObject
+import com.donut.mixfile.server.core.utils.toJsonString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
@@ -53,13 +53,13 @@ inline fun <reified T, reified C : Iterable<T>> cachedMutableOf(value: C, key: S
     constructCachedMutableValue(
         value,
         {
-            kv.encode(key, it.toJSONString())
+            kv.encode(key, it.toJsonString())
         },
         getter@{
             var result = value
             catchError {
                 if (kv.containsKey(key)) {
-                    val json: C = kv.decodeString(key).into()
+                    val json: C = kv.decodeString(key)?.parseJsonObject() ?: value
                     result = json
                 }
             }

app/src/main/java/com/donut/mixfile/util/file/FileImport.kt

@@ -12,7 +12,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.alibaba.fastjson2.into
 import com.donut.mixfile.activity.video.VideoActivity
 import com.donut.mixfile.app
 import com.donut.mixfile.currentActivity
@@ -21,6 +20,7 @@ import com.donut.mixfile.server.core.objects.isVideo
 import com.donut.mixfile.server.core.objects.toByteArray
 import com.donut.mixfile.server.core.utils.decompressGzip
 import com.donut.mixfile.server.core.utils.hashSHA256
+import com.donut.mixfile.server.core.utils.parseJsonObject
 import com.donut.mixfile.server.core.utils.sanitizeFileName
 import com.donut.mixfile.server.core.utils.toHex
 import com.donut.mixfile.ui.component.common.MixDialogBuilder
@@ -151,7 +151,7 @@ fun showImportConfirmWindow(fileList: List<FileDataLog>) {
 
 suspend fun loadFileList(url: String, progress: ProgressContent): List<FileDataLog> {
     val fileListData = loadDataWithMaxSize(url, progress)
-    return decompressGzip(fileListData).into()
+    return decompressGzip(fileListData).parseJsonObject()
 }
 
 fun importFileList(url: String) {

app/src/main/java/com/donut/mixfile/util/file/WebDavPreview.kt

@@ -28,11 +28,11 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.donut.mixfile.server.core.objects.FileDataLog
+import com.donut.mixfile.server.core.objects.WebDavFile
 import com.donut.mixfile.server.core.objects.isVideo
-import com.donut.mixfile.server.core.routes.api.webdav.objects.WebDavFile
+import com.donut.mixfile.server.core.objects.toDataLog
 import com.donut.mixfile.server.core.routes.api.webdav.objects.WebDavManager
 import com.donut.mixfile.server.core.routes.api.webdav.objects.normalizePath
-import com.donut.mixfile.server.core.routes.api.webdav.objects.toDataLog
 import com.donut.mixfile.ui.component.common.MixDialogBuilder
 import com.donut.mixfile.ui.routes.webdav.importWebDavData
 import com.donut.mixfile.ui.theme.colorScheme