diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 04904f0..d6b7225 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ android { applicationId = "com.donut.mixfile" minSdk = 24 targetSdk = 34 - versionCode = 42 - versionName = "1.4.11" + versionCode = 43 + versionName = "1.4.12" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/donut/mixfile/server/routes/UploadRoute.kt b/app/src/main/java/com/donut/mixfile/server/routes/UploadRoute.kt index cc14eef..a9fc993 100644 --- a/app/src/main/java/com/donut/mixfile/server/routes/UploadRoute.kt +++ b/app/src/main/java/com/donut/mixfile/server/routes/UploadRoute.kt @@ -16,7 +16,6 @@ import io.ktor.server.response.respondText import io.ktor.util.pipeline.PipelineContext import io.ktor.utils.io.ByteReadChannel import io.ktor.utils.io.core.readBytes -import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async diff --git a/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt b/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt index ec9c21e..8728163 100644 --- a/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt +++ b/app/src/main/java/com/donut/mixfile/ui/routes/favorites/Favorites.kt @@ -40,7 +40,6 @@ import com.donut.mixfile.util.file.updateMark import com.donut.mixfile.util.formatFileSize import com.donut.mixfile.util.truncate import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -130,7 +129,7 @@ val Favorites = MixNavPage( scope.launch(Dispatchers.IO) { val sorted = result.sortedBy { it.getNameNum() } withContext(Dispatchers.Main) { - if (resultCache == result){ + if (resultCache == result) { result = sorted } } diff --git a/app/src/main/java/com/donut/mixfile/ui/routes/home/UploadTask.kt b/app/src/main/java/com/donut/mixfile/ui/routes/home/UploadTask.kt index db9c78d..1ea3c02 100644 --- a/app/src/main/java/com/donut/mixfile/ui/routes/home/UploadTask.kt +++ b/app/src/main/java/com/donut/mixfile/ui/routes/home/UploadTask.kt @@ -34,6 +34,7 @@ import io.ktor.server.application.ApplicationCall import io.ktor.server.response.respondText import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import java.util.Date @OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class) @@ -128,15 +129,14 @@ class UploadTask( } - fun complete(shareInfo: MixShareInfo) { - result = shareInfo.toString() - appScope.launch { + suspend fun complete(shareInfo: MixShareInfo) { + withContext(Dispatchers.Main) { + result = shareInfo.toString() uploadTasks -= this@UploadTask + if (add) { + addUploadLog(shareInfo) + } } - if (add) { - addUploadLog(shareInfo) - } - } fun delete() { @@ -152,9 +152,7 @@ class UploadTask( } setPositiveButton("确定") { stop() - appScope.launch { - uploadTasks -= this@UploadTask - } + uploadTasks -= this@UploadTask closeDialog() } show()