feat: internal shared data directory

osfans · Jul 16, 2024 · f3ad724 · f3ad724
1 parent 1cc9edd
commit f3ad724
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 29 deletions.
diff --git a/app/src/main/java/com/osfans/trime/core/Rime.kt b/app/src/main/java/com/osfans/trime/core/Rime.kt
@@ -40,8 +40,8 @@ class Rime : RimeApi, RimeLifecycleOwner {
                     DataManager.dirFireChange()
                     DataManager.sync()
 
-                    val sharedDataDir = AppPrefs.defaultInstance().profile.sharedDataDir
-                    val userDataDir = AppPrefs.defaultInstance().profile.userDataDir
+                    val sharedDataDir = DataManager.sharedDataDir.absolutePath
+                    val userDataDir = DataManager.userDataDir.absolutePath
                     Timber.i("Starting up Rime APIs ...")
                     startupRime(sharedDataDir, userDataDir, fullCheck)
 

diff --git a/app/src/main/java/com/osfans/trime/data/base/DataManager.kt b/app/src/main/java/com/osfans/trime/data/base/DataManager.kt
@@ -71,8 +71,7 @@ object DataManager {
     }
 
     @JvmStatic
-    val sharedDataDir
-        get() = File(prefs.profile.sharedDataDir)
+    val sharedDataDir = File(appContext.getExternalFilesDir(null), "shared").also { it.mkdirs() }
 
     @JvmStatic
     val userDataDir
@@ -123,7 +122,7 @@ object DataManager {
             ResourceUtils.copyFile(DATA_CHECKSUMS_NAME, dataDir)
 
             // FIXME：缺失 default.custom.yaml 会导致方案列表为空
-            File(sharedDataDir, DEFAULT_CUSTOM_FILE_NAME).let {
+            File(userDataDir, DEFAULT_CUSTOM_FILE_NAME).let {
                 if (!it.exists()) {
                     Timber.d("Creating empty default.custom.yaml")
                     it.bufferedWriter().use { w -> w.write("") }

diff --git a/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt b/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt
@@ -22,7 +22,6 @@ object OpenCCDictManager {
     @Keep
     private val onDataDirChange =
         DataManager.OnDataDirChangeListener {
-            sharedDir = File(DataManager.sharedDataDir, "opencc").also { it.mkdirs() }
             userDir = File(DataManager.userDataDir, "opencc").also { it.mkdirs() }
         }
 
@@ -32,8 +31,8 @@ object OpenCCDictManager {
         DataManager.addOnChangedListener(onDataDirChange)
     }
 
-    var sharedDir = File(DataManager.sharedDataDir, "opencc").also { it.mkdirs() }
-    var userDir = File(DataManager.userDataDir, "opencc").also { it.mkdirs() }
+    private val sharedDir = File(DataManager.sharedDataDir, "opencc").also { it.mkdirs() }
+    private var userDir = File(DataManager.userDataDir, "opencc").also { it.mkdirs() }
 
     fun sharedDictionaries(): List<Dictionary> =
         sharedDir
@@ -45,12 +44,7 @@ object OpenCCDictManager {
             .listFiles()
             ?.mapNotNull { Dictionary.new(it) } ?: listOf()
 
-    fun getAllDictionaries(): List<Dictionary> =
-        if (sharedDir.path == userDir.path) {
-            userDictionaries()
-        } else {
-            (sharedDictionaries() + userDictionaries())
-        }
+    fun getAllDictionaries(): List<Dictionary> = sharedDictionaries() + userDictionaries()
 
     fun importFromFile(file: File): OpenCCDictionary {
         val raw =

diff --git a/app/src/main/java/com/osfans/trime/data/prefs/AppPrefs.kt b/app/src/main/java/com/osfans/trime/data/prefs/AppPrefs.kt
@@ -208,7 +208,6 @@ class AppPrefs(
      */
     class Profile(shared: SharedPreferences) : PreferenceDelegateOwner(shared) {
         companion object {
-            const val SHARED_DATA_DIR = "profile_shared_data_dir"
             const val USER_DATA_DIR = "profile_user_data_dir"
             const val SYNC_BACKGROUND_ENABLED = "profile_sync_in_background"
             const val TIMING_SYNC_ENABLED = "profile_timing_sync"
@@ -217,7 +216,6 @@ class AppPrefs(
             const val LAST_BACKGROUND_SYNC = "profile_last_background_sync"
         }
 
-        var sharedDataDir by string(SHARED_DATA_DIR, DataManager.defaultDataDirectory.path)
         var userDataDir by string(USER_DATA_DIR, DataManager.defaultDataDirectory.path)
         var syncBackgroundEnabled by bool(SYNC_BACKGROUND_ENABLED, false)
         var timingSyncEnabled by bool(TIMING_SYNC_ENABLED, false)

diff --git a/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt b/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt
@@ -42,9 +42,6 @@ object ThemeManager {
     private val userThemes: MutableList<String> get() = listThemes(DataManager.userDataDir)
 
     fun getAllThemes(): List<String> {
-        if (DataManager.sharedDataDir.absolutePath == DataManager.userDataDir.absolutePath) {
-            return userThemes
-        }
         return sharedThemes + userThemes
     }
 

diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt
@@ -67,10 +67,6 @@ class ProfileFragment :
     ) {
         addPreferencesFromResource(R.xml.profile_preference)
         with(preferenceScreen) {
-            get<FolderPickerPreference>("profile_shared_data_dir")?.apply {
-                setDefaultValue(DataManager.defaultDataDirectory.path)
-                registerDocumentTreeLauncher()
-            }
             get<FolderPickerPreference>("profile_user_data_dir")?.apply {
                 setDefaultValue(DataManager.defaultDataDirectory.path)
                 registerDocumentTreeLauncher()

diff --git a/app/src/main/res/xml/profile_preference.xml b/app/src/main/res/xml/profile_preference.xml
@@ -11,12 +11,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
     <PreferenceCategory android:title="@string/storage"
         app:iconSpaceReserved="false" >
-        <com.osfans.trime.ui.components.FolderPickerPreference
-            android:key="profile_shared_data_dir"
-            app:iconSpaceReserved="false"
-            android:title="@string/profile_shared_data_dir"
-            app:persistent="true"
-            app:useSimpleSummaryProvider="true" />
 
         <com.osfans.trime.ui.components.FolderPickerPreference
             android:key="profile_user_data_dir"