From 2c610b777dabf92ecdb03edb1d01980722b86be0 Mon Sep 17 00:00:00 2001 From: XuqmGroup Date: Thu, 18 Jun 2026 16:04:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(sdk-core):=20=E4=BF=AE=E5=A4=8D=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF=20=E2=80=94=20KDoc=20=E8=BD=AC?= =?UTF-8?q?=E4=B9=89=20+=20MasterKeys=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ConfigFileReader: KDoc 中 *.xuqmconfig 改为 \*.xuqmconfig(避免 */ 被解析为注释结束) - ConfigCache: MasterKey → MasterKeys(兼容当前 security-crypto 版本) Co-Authored-By: Claude --- sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigCache.kt | 6 +++--- .../src/main/java/com/xuqm/sdk/internal/ConfigFileReader.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigCache.kt b/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigCache.kt index 854726a..be935c2 100644 --- a/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigCache.kt +++ b/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigCache.kt @@ -3,7 +3,7 @@ package com.xuqm.sdk.internal import android.content.Context import android.util.Log import androidx.security.crypto.EncryptedSharedPreferences -import androidx.security.crypto.MasterKey +import androidx.security.crypto.MasterKeys import java.security.MessageDigest /** @@ -80,9 +80,9 @@ internal object ConfigCache { } private fun getPrefs(context: Context) = EncryptedSharedPreferences.create( - context, PREFS_NAME, - MasterKey.Builder(context).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build(), + MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC), + context, EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM, ) diff --git a/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigFileReader.kt b/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigFileReader.kt index 4658ed8..6a6f695 100644 --- a/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigFileReader.kt +++ b/sdk-core/src/main/java/com/xuqm/sdk/internal/ConfigFileReader.kt @@ -9,9 +9,9 @@ import com.google.gson.Gson * * 搜索顺序(对齐 RN SDK 的 src/assets/config/): * 1. assets/config/config.xuqmconfig 或 config.xuqm - * 2. assets/config/*.xuqmconfig(取第一个) + * 2. assets/config/\*.xuqmconfig(取第一个) * 3. assets/xuqm/config.xuqm(旧路径兼容) - * 4. assets/xuqm/*.xuqmconfig(旧路径兼容) + * 4. assets/xuqm/\*.xuqmconfig(旧路径兼容) * * 缓存策略: * - [readRawBytes]:只读取文件原始字节,不做解密(主线程安全,<5ms)