Skip to content

Commit 4cb8108

Browse files
committed
feat:(settings): the restart after deploy is not required now
1 parent 1f495e3 commit 4cb8108

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

app/src/main/java/com/osfans/trime/settings/PrefMainActivity.kt

-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ class PrefMainActivity :
185185
Timber.e(ex, "Deploy Exception")
186186
} finally {
187187
progressDialog.dismiss()
188-
// exitProcess(0)
189188
}
190189
}
191190
}

app/src/main/java/com/osfans/trime/settings/components/SchemaPickerDialog.kt

-11
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ package com.osfans.trime.settings.components
33
import android.app.Dialog
44
import android.app.ProgressDialog
55
import android.content.Context
6-
import android.content.Intent
76
import android.os.Build
87
import android.view.WindowManager
98
import androidx.appcompat.app.AlertDialog
109
import com.osfans.trime.R
1110
import com.osfans.trime.Rime
1211
import com.osfans.trime.ime.core.Trime
13-
import com.osfans.trime.settings.PrefMainActivity
1412
import com.osfans.trime.setup.Config
1513
import com.osfans.trime.util.RimeUtils
1614
import kotlinx.coroutines.CoroutineScope
@@ -21,7 +19,6 @@ import kotlinx.coroutines.launch
2119
import kotlinx.coroutines.withContext
2220
import timber.log.Timber
2321
import kotlin.coroutines.CoroutineContext
24-
import kotlin.system.exitProcess
2522

2623
class SchemaPickerDialog(
2724
private val context: Context
@@ -86,14 +83,6 @@ class SchemaPickerDialog(
8683
Timber.e(e, "Failed to set schema")
8784
} finally {
8885
progressDialog.dismiss()
89-
val intent = Intent(context, PrefMainActivity::class.java)
90-
intent.flags = (
91-
Intent.FLAG_ACTIVITY_NEW_TASK
92-
or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK
93-
)
94-
context.startActivity(intent)
95-
android.os.Process.killProcess(android.os.Process.myPid())
96-
exitProcess(0) // 清理内存
9786
}
9887
}
9988
}

app/src/main/java/com/osfans/trime/settings/fragments/ConfFragment.kt

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import org.ocpsoft.prettytime.PrettyTime
2020
import timber.log.Timber
2121
import java.util.Date
2222
import kotlin.coroutines.CoroutineContext
23-
import kotlin.system.exitProcess
2423

2524
class ConfFragment : PreferenceFragmentCompat(), CoroutineScope {
2625
private val job = Job()
@@ -56,7 +55,6 @@ class ConfFragment : PreferenceFragmentCompat(), CoroutineScope {
5655
Timber.e(ex, "Sync Exception")
5756
} finally {
5857
progressDialog.dismiss()
59-
exitProcess(0)
6058
}
6159
}.run()
6260
}

0 commit comments

Comments
 (0)