From 3138746a8fcd93b439e38c13962f359ec478fe85 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: Tue, 10 Sep 2024 10:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                      | 4 ++--
 app/src/main/java/com/donut/mixfile/App.kt                | 4 +++-
 app/src/main/java/com/donut/mixfile/MainActivity.kt       | 3 ---
 app/src/main/java/com/donut/mixfile/ui/routes/Settings.kt | 5 -----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c700de6..cf24d98 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 = 17
-        versionName = "1.1.1"
+        versionCode = 18
+        versionName = "1.1.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/com/donut/mixfile/App.kt b/app/src/main/java/com/donut/mixfile/App.kt
index 7624a58..f8bc449 100644
--- a/app/src/main/java/com/donut/mixfile/App.kt
+++ b/app/src/main/java/com/donut/mixfile/App.kt
@@ -50,7 +50,9 @@ class App : Application(), ImageLoaderFactory {
         innerApp = this
         MMKV.initialize(this)
         kv = MMKV.defaultMMKV()
-        startService(Intent(this, FileService::class.java))
+        startService(Intent(this, FileService::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        })
     }
 
     override fun newImageLoader(): ImageLoader {
diff --git a/app/src/main/java/com/donut/mixfile/MainActivity.kt b/app/src/main/java/com/donut/mixfile/MainActivity.kt
index e0c8ce6..2e0990b 100644
--- a/app/src/main/java/com/donut/mixfile/MainActivity.kt
+++ b/app/src/main/java/com/donut/mixfile/MainActivity.kt
@@ -1,6 +1,5 @@
 package com.donut.mixfile
 
-import android.content.Intent
 import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.os.Build
@@ -9,7 +8,6 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.NotificationManagerCompat
-import com.donut.mixfile.server.FileService
 import com.donut.mixfile.ui.component.MainContent
 import com.donut.mixfile.ui.theme.MainTheme
 import com.donut.mixfile.util.file.MixFileSelector
@@ -27,7 +25,6 @@ class MainActivity : MixActivity(MAIN_ID) {
         super.onDestroy()
         mixFileSelector.unregister()
         unregisterReceiver(networkChangeReceiver)
-        startService(Intent(this, FileService::class.java))
     }
 
     private val requestNotificationPermissionLauncher =
diff --git a/app/src/main/java/com/donut/mixfile/ui/routes/Settings.kt b/app/src/main/java/com/donut/mixfile/ui/routes/Settings.kt
index 182d92b..a5cf7a7 100644
--- a/app/src/main/java/com/donut/mixfile/ui/routes/Settings.kt
+++ b/app/src/main/java/com/donut/mixfile/ui/routes/Settings.kt
@@ -24,12 +24,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.donut.mixfile.appScope
 import com.donut.mixfile.currentActivity
 import com.donut.mixfile.server.UPLOADERS
 import com.donut.mixfile.server.UPLOAD_RETRY_TIMES
@@ -45,13 +43,10 @@ import com.donut.mixfile.ui.component.common.CommonSwitch
 import com.donut.mixfile.ui.component.common.MixDialogBuilder
 import com.donut.mixfile.ui.component.common.SingleSelectItemList
 import com.donut.mixfile.ui.nav.MixNavPage
-import com.donut.mixfile.util.OnResume
 import com.donut.mixfile.util.TipText
 import com.donut.mixfile.util.cachedMutableOf
 import com.donut.mixfile.util.file.uploadLogs
 import com.donut.mixfile.util.showToast
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 
 var useShortCode by cachedMutableOf(true, "use_short_code")