Skip to content

Commit 979d46d

Browse files
committed
chore(util): fine tune usages
1 parent 71e5e0b commit 979d46d

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

app/src/main/java/com/osfans/trime/ime/core/Preferences.kt

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package com.osfans.trime.ime.core
33
import android.content.Context
44
import android.content.SharedPreferences
55
import android.os.Build
6+
import android.os.Environment
7+
import androidx.core.os.EnvironmentCompat
68
import androidx.core.os.UserManagerCompat
79
import androidx.preference.PreferenceManager
8-
import com.blankj.utilcode.util.PathUtils
910
import com.osfans.trime.R
1011
import com.osfans.trime.ime.enums.InlineModeType
1112
import com.osfans.trime.ime.landscapeinput.LandscapeInputUIMode
13+
import com.osfans.trime.util.appContext
1214
import java.lang.ref.WeakReference
1315

1416
/**
@@ -294,13 +296,13 @@ class Preferences(
294296
const val SYNC_BACKGROUND_ENABLED = "conf__sync_background"
295297
const val LAST_SYNC_STATUS = "conf__last_sync_status"
296298
const val LAST_SYNC_TIME = "conf__last_sync_time"
297-
val SDCARD_PATH_PREFIX: String = PathUtils.getExternalStoragePath()
299+
val EXTERNAL_PATH_PREFIX: String = appContext.getExternalFilesDir(null)!!.absolutePath
298300
}
299301
var sharedDataDir: String
300-
get() = prefs.getPref(SHARED_DATA_DIR, "$SDCARD_PATH_PREFIX/rime")
302+
get() = prefs.getPref(SHARED_DATA_DIR, "$EXTERNAL_PATH_PREFIX/rime")
301303
set(v) = prefs.setPref(SHARED_DATA_DIR, v)
302304
var userDataDir: String
303-
get() = prefs.getPref(USER_DATA_DIR, "$SDCARD_PATH_PREFIX/rime")
305+
get() = prefs.getPref(USER_DATA_DIR, "$EXTERNAL_PATH_PREFIX/rime")
304306
set(v) = prefs.setPref(USER_DATA_DIR, v)
305307
var syncBackgroundEnabled: Boolean
306308
get() = prefs.getPref(SYNC_BACKGROUND_ENABLED, false)

app/src/main/java/com/osfans/trime/util/AppVersionUtils.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.osfans.trime.util
22

33
import android.net.Uri
44
import androidx.preference.Preference
5-
import com.blankj.utilcode.util.AppUtils
5+
import com.osfans.trime.BuildConfig
66
import com.osfans.trime.ime.core.Preferences
77

88
object AppVersionUtils {
@@ -13,7 +13,7 @@ object AppVersionUtils {
1313
* @param prefs the [Preferences] instance.
1414
*/
1515
fun isDifferentVersion(prefs: Preferences): Boolean {
16-
val currentVersionName = AppUtils.getAppVersionName()
16+
val currentVersionName = BuildConfig.VERSION_NAME
1717
val lastVersionName = prefs.general.lastVersionName
1818
return !currentVersionName.contentEquals(lastVersionName).also {
1919
prefs.general.lastVersionName = currentVersionName
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.osfans.trime.util
2+
3+
import android.content.Context
4+
import com.osfans.trime.TrimeApplication
5+
6+
val appContext: Context get() = TrimeApplication.getInstance().applicationContext

0 commit comments

Comments
 (0)