Modify change YukiHookModulePrefs name to YukiHookPrefsBridge and make it support native storage usage in YukiHookPrefsBridge

2025-09-06 02:35:40 +08:00 · 2023-04-17 03:35:05 +08:00
parent e298f19e33
commit 390ee9e509
23 changed files with 458 additions and 194 deletions
--- a/yukihookapi/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt
+++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt
@@ -57,7 +57,7 @@ import com.highcapable.yukihookapi.hook.xposed.bridge.YukiXposedModule
 import com.highcapable.yukihookapi.hook.xposed.bridge.status.YukiXposedModuleStatus
 import com.highcapable.yukihookapi.hook.xposed.bridge.type.HookEntryType
 import com.highcapable.yukihookapi.hook.xposed.channel.YukiHookDataChannel
-import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookModulePrefs
+import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookPrefsBridge
 import java.lang.reflect.Constructor
 import java.lang.reflect.Field
 import java.lang.reflect.Member
@@ -281,13 +281,27 @@ object YukiHookAPI {
            }

        /**
-         * 是否启用 [YukiHookModulePrefs] 的键值缓存功能
+         * 是否启用 [YukiHookPrefsBridge] 的键值缓存功能
+         *
+         * - ❗此方法已弃用 - 在之后的版本中将直接被删除
+         *
+         * - ❗请现在转移到 [isEnablePrefsBridgeCache]
+         */
+        @Deprecated(message = "请使用新的命名方法来实现此功能", ReplaceWith("isEnablePrefsBridgeCache"))
+        var isEnableModulePrefsCache
+            get() = isEnablePrefsBridgeCache
+            set(value) {
+                isEnablePrefsBridgeCache = value
+            }
+
+        /**
+         * 是否启用 [YukiHookPrefsBridge] 的键值缓存功能
         *
         * - 为防止内存复用过高问题 - 此功能默认启用
         *
-         * 你可以手动在 [YukiHookModulePrefs] 中自由开启和关闭缓存功能以及清除缓存
+         * 你可以手动在 [YukiHookPrefsBridge] 中自由开启和关闭缓存功能以及清除缓存
         */
-        var isEnableModulePrefsCache = true
+        var isEnablePrefsBridgeCache = true

        /**
         * 是否启用当前 Xposed 模块自身 [Resources] 缓存功能
@@ -316,7 +330,7 @@ object YukiHookAPI {
         *
         * - ❗这是一个可选的实验性功能 - 此功能默认不启用
         *
-         * - 仅用于修复某些系统可能会出现在启用了 New XSharedPreferences 后依然出现文件权限错误问题 - 若你能正常使用 [YukiHookModulePrefs] 就不建议启用此功能
+         * - 仅用于修复某些系统可能会出现在启用了 New XSharedPreferences 后依然出现文件权限错误问题 - 若你能正常使用 [YukiHookPrefsBridge] 就不建议启用此功能
         */
        var isEnableHookSharedPreferences = false

--- a/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt
+++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt
@@ -49,7 +49,7 @@ import com.highcapable.yukihookapi.hook.xposed.parasitic.AppParasitics
 import com.highcapable.yukihookapi.hook.xposed.parasitic.activity.base.ModuleAppActivity
 import com.highcapable.yukihookapi.hook.xposed.parasitic.activity.base.ModuleAppCompatActivity
 import com.highcapable.yukihookapi.hook.xposed.parasitic.context.wrapper.ModuleContextThemeWrapper
-import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookModulePrefs
+import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookPrefsBridge
 import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit
 import java.io.BufferedReader
 import java.io.File
@@ -76,16 +76,38 @@ fun IYukiHookXposedInit.encase(vararg hooker: YukiBaseHooker) = YukiHookAPI.enca

 /**
 * 获取模块的存取对象
- * @return [YukiHookModulePrefs]
+ *
+ * - ❗此方法已弃用 - 在之后的版本中将直接被删除
+ *
+ * - ❗请现在转移到 [Context.prefs] 方法
+ * @return [YukiHookPrefsBridge]
 */
-val Context.modulePrefs get() = YukiHookModulePrefs.instance(context = this)
+@Deprecated(message = "请使用新的命名方法", ReplaceWith("prefs()"))
+val Context.modulePrefs get() = prefs()

 /**
 * 获取模块的存取对象
- * @param name 自定义 Sp 存储名称
- * @return [YukiHookModulePrefs]
+ *
+ * - ❗此方法已弃用 - 在之后的版本中将直接被删除
+ *
+ * - ❗请现在转移到 [Context.prefs] 方法
+ * @return [YukiHookPrefsBridge]
 */
-fun Context.modulePrefs(name: String) = modulePrefs.name(name)
+@Deprecated(message = "请使用新的命名方法", ReplaceWith("prefs(name)"))
+fun Context.modulePrefs(name: String) = prefs(name)
+
+/**
+ * 获取 [YukiHookPrefsBridge] 对象
+ *
+ * 可以同时在模块与 (Xposed) 宿主环境中使用
+ *
+ * 如果你想在 (Xposed) 宿主环境将数据存入当前宿主的私有空间 - 请使用 [YukiHookPrefsBridge.native] 方法
+ *
+ * 在未声明任何条件的情况下 (Xposed) 宿主环境默认读取模块中的数据
+ * @param name 自定义 Sp 存储名称 - 默认空
+ * @return [YukiHookPrefsBridge]
+ */
+fun Context.prefs(name: String = "") = YukiHookPrefsBridge.instance(context = this).let { if (name.isNotBlank()) it.name(name) else it }

 /**
 * 获取模块的数据通讯桥命名空间对象
--- a/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/PackageParam.kt
+++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/PackageParam.kt
@@ -56,7 +56,7 @@ import com.highcapable.yukihookapi.hook.xposed.bridge.resources.YukiResources
 import com.highcapable.yukihookapi.hook.xposed.bridge.type.HookEntryType
 import com.highcapable.yukihookapi.hook.xposed.channel.YukiHookDataChannel
 import com.highcapable.yukihookapi.hook.xposed.parasitic.AppParasitics
-import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookModulePrefs
+import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookPrefsBridge

 /**
 * 装载 Hook 的目标 APP 入口对象实现类
@@ -181,16 +181,16 @@ open class PackageParam internal constructor(@PublishedApi internal var wrapper:
     * 获得当前使用的存取数据对象缓存实例
     *
     * - ❗作为 Hook API 装载时无法使用 - 会抛出异常
-     * @return [YukiHookModulePrefs]
+     * @return [YukiHookPrefsBridge]
     */
-    val prefs get() = YukiHookModulePrefs.instance()
+    val prefs get() = YukiHookPrefsBridge.instance()

    /**
     * 获得当前使用的存取数据对象缓存实例
     *
     * - ❗作为 Hook API 装载时无法使用 - 会抛出异常
     * @param name 自定义 Sp 存储名称
-     * @return [YukiHookModulePrefs]
+     * @return [YukiHookPrefsBridge]
     */
    fun prefs(name: String) = prefs.name(name)

--- a/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookPrefsBridge.kt
+++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookPrefsBridge.kt
@@ -37,42 +37,35 @@ import com.highcapable.yukihookapi.hook.log.yLoggerE
 import com.highcapable.yukihookapi.hook.log.yLoggerW
 import com.highcapable.yukihookapi.hook.xposed.bridge.YukiXposedModule
 import com.highcapable.yukihookapi.hook.xposed.bridge.delegate.XSharedPreferencesDelegate
+import com.highcapable.yukihookapi.hook.xposed.parasitic.AppParasitics
 import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData
 import com.highcapable.yukihookapi.hook.xposed.prefs.ui.ModulePreferenceFragment
 import de.robv.android.xposed.XSharedPreferences
 import java.io.File

 /**
- * 实现 Xposed 模块的数据存取
- *
- * 对接 [SharedPreferences] 和 [XSharedPreferences]
+ * [YukiHookAPI] 对 [SharedPreferences]、[XSharedPreferences] 的扩展存储桥实现
 *
 * 在不同环境智能选择存取使用的对象
 *
- * - ❗请注意此功能为实验性功能 - 仅在 LSPosed 环境测试通过 - EdXposed 理论也可以使用但不再推荐
+ * - ❗模块与宿主之前共享数据存储为实验性功能 - 仅在 LSPosed 环境测试通过 - EdXposed 理论也可以使用但不再推荐
 *
- * - 使用 LSPosed 环境请在 AndroidManifests.xml 中将 "xposedminversion" 最低设置为 93
+ * 对于在模块环境中使用 [PreferenceFragmentCompat] - [YukiHookAPI] 提供了 [ModulePreferenceFragment] 来实现同样的功能
 *
- * - 未使用 LSPosed 环境请将你的模块 API 降至 26 以下 - [YukiHookAPI] 将会尝试使用 [makeWorldReadable] 但仍有可能不成功
+ * 详情请参考 [API 文档 - YukiHookPrefsBridge](https://fankes.github.io/YukiHookAPI/zh-cn/api/public/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookPrefsBridge)
 *
- * - ❗当你在模块中存取数据的时候 [context] 必须不能是空的
- *
- * - 若你正在使用 [PreferenceFragmentCompat] - 请迁移到 [ModulePreferenceFragment] 以适配上述功能特性
- *
- * 详情请参考 [API 文档 - YukiHookModulePrefs](https://fankes.github.io/YukiHookAPI/zh-cn/api/public/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs)
- *
- * For English version, see [API Document - YukiHookModulePrefs](https://fankes.github.io/YukiHookAPI/en/api/public/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs)
+ * For English version, see [API Document - YukiHookPrefsBridge](https://fankes.github.io/YukiHookAPI/en/api/public/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookPrefsBridge)
 * @param context 上下文实例 - 默认空
 */
-class YukiHookModulePrefs private constructor(private var context: Context? = null) {
+class YukiHookPrefsBridge private constructor(private var context: Context? = null) {

    internal companion object {

        /** 当前是否为 (Xposed) 宿主环境 */
        private val isXposedEnvironment = YukiXposedModule.isXposedEnvironment

-        /** 当前 [YukiHookModulePrefs] 单例 */
-        private var instance: YukiHookModulePrefs? = null
+        /** 当前 [YukiHookPrefsBridge] 单例 */
+        private var instance: YukiHookPrefsBridge? = null

        /** 当前缓存的 [XSharedPreferencesDelegate] 实例数组 */
        private val xPrefs = HashMap<String, XSharedPreferencesDelegate>()
@@ -81,12 +74,12 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
        private val sPrefs = HashMap<String, SharedPreferences>()

        /**
-         * 获取 [YukiHookModulePrefs] 单例
+         * 获取 [YukiHookPrefsBridge] 单例
         * @param context 实例 -  (Xposed) 宿主环境为空
-         * @return [YukiHookModulePrefs]
+         * @return [YukiHookPrefsBridge]
         */
        internal fun instance(context: Context? = null) =
-            instance?.apply { if (context != null) this.context = context } ?: YukiHookModulePrefs(context).apply { instance = this }
+            instance?.apply { if (context != null) this.context = context } ?: YukiHookPrefsBridge(context).apply { instance = this }

        /**
         * 设置全局可读可写
@@ -105,15 +98,28 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
        }
    }

-    /** 存储名称 - 默认包名 + _preferences */
-    private var prefsName = "${YukiXposedModule.modulePackageName.ifBlank { context?.packageName ?: "" }}_preferences"
+    /** 存储名称 */
+    private var prefsName = ""
+
+    /**
+     * 获取当前存储名称 - 默认包名 + _preferences
+     * @return [String]
+     */
+    private val currentPrefsName
+        get() = prefsName.ifBlank {
+            if (isUsingNativeStorage) "${context?.packageName ?: "unknown"}_preferences"
+            else "${YukiXposedModule.modulePackageName.ifBlank { context?.packageName ?: "unknown" }}_preferences"
+        }

    /** 是否使用键值缓存 */
-    private var isUsingKeyValueCache = YukiHookAPI.Configs.isEnableModulePrefsCache
+    private var isUsingKeyValueCache = YukiHookAPI.Configs.isEnablePrefsBridgeCache

-    /** 是否使用新版存储方式 EdXposed/LSPosed */
+    /** 是否使用新版存储方式 EdXposed、LSPosed */
    private var isUsingNewXSharedPreferences = false

+    /** 是否启用原生存储方式 */
+    private var isUsingNativeStorage = false
+
    /**
     * [XSharedPreferences] 缓存的键值数据
     */
@@ -150,7 +156,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu

    /** 检查 API 装载状态 */
    private fun checkApi() {
-        if (YukiHookAPI.isLoadedFromBaseContext) error("YukiHookModulePrefs not allowed in Custom Hook API")
+        if (YukiHookAPI.isLoadedFromBaseContext) error("YukiHookPrefsBridge not allowed in Custom Hook API")
        if (isXposedEnvironment && YukiXposedModule.modulePackageName.isBlank())
            error("Xposed modulePackageName load failed, please reset and rebuild it")
    }
@@ -162,9 +168,10 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
    private val currentXsp
        get() = checkApi().let {
            runCatching {
-                (xPrefs[prefsName]?.instance ?: XSharedPreferencesDelegate.from(YukiXposedModule.modulePackageName, prefsName).also {
-                    xPrefs[prefsName] = it
-                }.instance).apply {
+                (xPrefs[currentPrefsName]?.instance ?: XSharedPreferencesDelegate.from(YukiXposedModule.modulePackageName, currentPrefsName)
+                    .also {
+                        xPrefs[currentPrefsName] = it
+                    }.instance).apply {
                    makeWorldReadable()
                    reload()
                }
@@ -180,21 +187,22 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
        get() = checkApi().let {
            runCatching {
                @Suppress("DEPRECATION", "WorldReadableFiles")
-                sPrefs[context.toString() + prefsName] ?: context?.getSharedPreferences(prefsName, Context.MODE_WORLD_READABLE)?.also {
-                    isUsingNewXSharedPreferences = true
-                    sPrefs[context.toString() + prefsName] = it
-                } ?: error("YukiHookModulePrefs missing Context instance")
+                sPrefs[context.toString() + currentPrefsName] ?: context?.getSharedPreferences(currentPrefsName, Context.MODE_WORLD_READABLE)
+                    ?.also {
+                        isUsingNewXSharedPreferences = true
+                        sPrefs[context.toString() + currentPrefsName] = it
+                    } ?: error("YukiHookPrefsBridge missing Context instance")
            }.getOrElse {
-                sPrefs[context.toString() + prefsName] ?: context?.getSharedPreferences(prefsName, Context.MODE_PRIVATE)?.also {
+                sPrefs[context.toString() + currentPrefsName] ?: context?.getSharedPreferences(currentPrefsName, Context.MODE_PRIVATE)?.also {
                    isUsingNewXSharedPreferences = false
-                    sPrefs[context.toString() + prefsName] = it
-                } ?: error("YukiHookModulePrefs missing Context instance")
+                    sPrefs[context.toString() + currentPrefsName] = it
+                } ?: error("YukiHookPrefsBridge missing Context instance")
            }
        }

    /** 设置全局可读可写 */
    private fun makeWorldReadable() = runCatching {
-        if (isUsingNewXSharedPreferences.not()) makeWorldReadable(context, prefsFileName = "${prefsName}.xml")
+        if (isUsingNewXSharedPreferences.not()) makeWorldReadable(context, prefsFileName = "${currentPrefsName}.xml")
    }

    /**
@@ -209,7 +217,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
    val isXSharePrefsReadable get() = isPreferencesAvailable

    /**
-     * 获取 [YukiHookModulePrefs] 是否正处于 EdXposed/LSPosed 的最高权限运行
+     * 获取 [YukiHookPrefsBridge] 是否正处于 EdXposed/LSPosed 的最高权限运行
     *
     * - ❗此方法已弃用 - 在之后的版本中将直接被删除
     *
@@ -220,7 +228,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
    val isRunInNewXShareMode get() = isPreferencesAvailable

    /**
-     * 获取当前 [YukiHookModulePrefs] 的可用状态
+     * 获取当前 [YukiHookPrefsBridge] 的可用状态
     *
     * - 在 (Xposed) 宿主环境中返回 [XSharedPreferences] 可用状态 (可读)
     *
@@ -239,10 +247,10 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
    /**
     * 自定义 Sp 存储名称
     * @param name 自定义的 Sp 存储名称
-     * @return [YukiHookModulePrefs]
+     * @return [YukiHookPrefsBridge]
     */
-    fun name(name: String): YukiHookModulePrefs {
-        isUsingKeyValueCache = YukiHookAPI.Configs.isEnableModulePrefsCache
+    fun name(name: String): YukiHookPrefsBridge {
+        isUsingKeyValueCache = YukiHookAPI.Configs.isEnablePrefsBridgeCache
        prefsName = name
        return this
    }
@@ -253,13 +261,25 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * 无论是否开启 [YukiHookAPI.Configs.isEnableModulePrefsCache]
     *
     * - 仅在 [XSharedPreferences] 下生效
-     * @return [YukiHookModulePrefs]
+     * @return [YukiHookPrefsBridge]
     */
-    fun direct(): YukiHookModulePrefs {
+    fun direct(): YukiHookPrefsBridge {
        isUsingKeyValueCache = false
        return this
    }

+    /**
+     * 忽略当前环境直接使用 [Context.getSharedPreferences] 存取数据
+     * @return [YukiHookPrefsBridge]
+     * @throws IllegalStateException 如果 [context] 为空
+     */
+    fun native(): YukiHookPrefsBridge {
+        if (isXposedEnvironment && context == null) context = AppParasitics.currentApplication
+            ?: error("The Host App's Context has not yet initialized successfully, the native function cannot be used at this time")
+        isUsingNativeStorage = true
+        return this
+    }
+
    /**
     * 获取 [String] 键值
     *
@@ -271,7 +291,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [String]
     */
    fun getString(key: String, value: String = "") =
-        (if (isXposedEnvironment)
+        (if (isXposedEnvironment && isUsingNativeStorage.not())
            if (isUsingKeyValueCache)
                XSharedPreferencesCaches.stringData[key].let {
                    (it ?: currentXsp.getString(key, value) ?: value).let { value ->
@@ -282,7 +302,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
            else resetCacheSet { currentXsp.getString(key, value) ?: value }
        else currentSp.getString(key, value) ?: value).let {
            makeWorldReadable()
-            it
+            resetNativeSet { it }
        }

    /**
@@ -296,7 +316,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [Set]<[String]>
     */
    fun getStringSet(key: String, value: Set<String>) =
-        (if (isXposedEnvironment)
+        (if (isXposedEnvironment && isUsingNativeStorage.not())
            if (isUsingKeyValueCache)
                XSharedPreferencesCaches.stringSetData[key].let {
                    (it ?: currentXsp.getStringSet(key, value) ?: value).let { value ->
@@ -307,7 +327,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
            else resetCacheSet { currentXsp.getStringSet(key, value) ?: value }
        else currentSp.getStringSet(key, value) ?: value).let {
            makeWorldReadable()
-            it
+            resetNativeSet { it }
        }

    /**
@@ -321,7 +341,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [Boolean]
     */
    fun getBoolean(key: String, value: Boolean = false) =
-        (if (isXposedEnvironment)
+        (if (isXposedEnvironment && isUsingNativeStorage.not())
            if (isUsingKeyValueCache)
                XSharedPreferencesCaches.booleanData[key].let {
                    it ?: currentXsp.getBoolean(key, value).let { value ->
@@ -332,7 +352,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
            else resetCacheSet { currentXsp.getBoolean(key, value) }
        else currentSp.getBoolean(key, value)).let {
            makeWorldReadable()
-            it
+            resetNativeSet { it }
        }

    /**
@@ -346,7 +366,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [Int]
     */
    fun getInt(key: String, value: Int = 0) =
-        (if (isXposedEnvironment)
+        (if (isXposedEnvironment && isUsingNativeStorage.not())
            if (isUsingKeyValueCache)
                XSharedPreferencesCaches.intData[key].let {
                    it ?: currentXsp.getInt(key, value).let { value ->
@@ -357,7 +377,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
            else resetCacheSet { currentXsp.getInt(key, value) }
        else currentSp.getInt(key, value)).let {
            makeWorldReadable()
-            it
+            resetNativeSet { it }
        }

    /**
@@ -371,7 +391,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [Float]
     */
    fun getFloat(key: String, value: Float = 0f) =
-        (if (isXposedEnvironment)
+        (if (isXposedEnvironment && isUsingNativeStorage.not())
            if (isUsingKeyValueCache)
                XSharedPreferencesCaches.floatData[key].let {
                    it ?: currentXsp.getFloat(key, value).let { value ->
@@ -382,7 +402,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
            else resetCacheSet { currentXsp.getFloat(key, value) }
        else currentSp.getFloat(key, value)).let {
            makeWorldReadable()
-            it
+            resetNativeSet { it }
        }

    /**
@@ -396,7 +416,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [Long]
     */
    fun getLong(key: String, value: Long = 0L) =
-        (if (isXposedEnvironment)
+        (if (isXposedEnvironment && isUsingNativeStorage.not())
            if (isUsingKeyValueCache)
                XSharedPreferencesCaches.longData[key].let {
                    it ?: currentXsp.getLong(key, value).let { value ->
@@ -407,7 +427,7 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
            else resetCacheSet { currentXsp.getLong(key, value) }
        else currentSp.getLong(key, value)).let {
            makeWorldReadable()
-            it
+            resetNativeSet { it }
        }

    /**
@@ -617,12 +637,22 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
     * @return [T]
     */
    private inline fun <T> resetCacheSet(result: () -> T): T {
-        isUsingKeyValueCache = YukiHookAPI.Configs.isEnableModulePrefsCache
+        isUsingKeyValueCache = YukiHookAPI.Configs.isEnablePrefsBridgeCache
        return result()
    }

    /**
-     * [YukiHookModulePrefs] 的存储代理类
+     * 恢复 [isUsingNativeStorage] 为默认状态
+     * @param result 回调方法体的结果
+     * @return [T]
+     */
+    private inline fun <T> resetNativeSet(result: () -> T): T {
+        isUsingNativeStorage = false
+        return result()
+    }
+
+    /**
+     * [YukiHookPrefsBridge] 的存储代理类
     *
     * - ❗请使用 [edit] 方法来获取 [Editor]
     *
@@ -770,10 +800,10 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
         * 提交更改 (同步)
         * @return [Boolean] 是否成功
         */
-        fun commit() = editor?.commit()?.also { makeWorldReadable() } ?: false
+        fun commit() = resetNativeSet { editor?.commit()?.also { makeWorldReadable() } ?: false }

        /** 提交更改 (异步) */
-        fun apply() = editor?.apply().also { makeWorldReadable() } ?: Unit
+        fun apply() = resetNativeSet { editor?.apply().also { makeWorldReadable() } ?: Unit }

        /**
         * 仅在模块环境执行
@@ -783,8 +813,8 @@ class YukiHookModulePrefs private constructor(private var context: Context? = nu
         * @return [Editor]
         */
        private inline fun moduleEnvironment(callback: () -> Unit): Editor {
-            if (isXposedEnvironment.not()) callback()
-            else yLoggerW(msg = "YukiHookModulePrefs.Editor not allowed in Xposed Environment")
+            if (isXposedEnvironment.not() || isUsingNativeStorage) callback()
+            else yLoggerW(msg = "YukiHookPrefsBridge.Editor not allowed in Xposed Environment")
            return this
        }
    }
--- a/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData.kt
+++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData.kt
@@ -27,13 +27,13 @@
 */
 package com.highcapable.yukihookapi.hook.xposed.prefs.data

-import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookModulePrefs
+import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookPrefsBridge
 import java.io.Serializable

 /**
 * 键值对存储构造类
 *
- * 这个类是对 [YukiHookModulePrefs] 的一个扩展用法
+ * 这个类是对 [YukiHookPrefsBridge] 的一个扩展用法
 *
 * 详情请参考 [API 文档 - PrefsData](https://fankes.github.io/YukiHookAPI/zh-cn/api/public/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData)
 *
--- a/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/ui/ModulePreferenceFragment.kt
+++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/ui/ModulePreferenceFragment.kt
@@ -38,7 +38,7 @@ import androidx.preference.PreferenceManager
 import androidx.preference.PreferenceScreen
 import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.hook.utils.unit
-import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookModulePrefs
+import com.highcapable.yukihookapi.hook.xposed.prefs.YukiHookPrefsBridge

 /**
 * 这是对使用 [YukiHookAPI] Xposed 模块实现中的一个扩展功能
@@ -105,5 +105,5 @@ abstract class ModulePreferenceFragment : PreferenceFragmentCompat(), SharedPref
    private fun makeNewXShareReadableIfPossible() = runCatching {
        @Suppress("DEPRECATION", "WorldReadableFiles")
        currentActivity.getSharedPreferences(prefsName, Context.MODE_WORLD_READABLE)
-    }.onFailure { YukiHookModulePrefs.makeWorldReadable(currentActivity, prefsFileName = "$prefsName.xml") }.unit()
+    }.onFailure { YukiHookPrefsBridge.makeWorldReadable(currentActivity, prefsFileName = "$prefsName.xml") }.unit()
 }