Skip to content

Commit fc1be7e

Browse files
author
Chenhe
committed
适配首选项的 device protected storage
1 parent 104d742 commit fc1be7e

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

app/src/main/java/cc/chenhe/qqnotifyevo/preference/AdvancedFr.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class AdvancedFr : PreferenceFragmentCompat() {
2020
private lateinit var deleteLog: Preference
2121

2222
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
23+
preferenceManager.setStorageDeviceProtected()
2324
setPreferencesFromResource(R.xml.pref_advanced, rootKey)
2425

2526
findPreference<EditTextPreference>("nickname_wrapper")!!.apply {

app/src/main/java/cc/chenhe/qqnotifyevo/preference/MainPreferenceFr.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class MainPreferenceFr : PreferenceFragmentCompat() {
4343
}
4444

4545
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
46+
preferenceManager.setStorageDeviceProtected()
4647
setPreferencesFromResource(R.xml.pref_main, rootKey)
4748
findPreference<Preference>("donate")?.isVisible = !BuildConfig.PLAY
4849

app/src/main/java/cc/chenhe/qqnotifyevo/preference/PermissionFr.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class PermissionFr : PreferenceFragmentCompat() {
3232
}
3333

3434
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
35+
preferenceManager.setStorageDeviceProtected()
3536
setPreferencesFromResource(R.xml.pref_permission, rootKey)
3637
notification = findPreference("notf_permit")!!
3738
accessibility = findPreference("aces_permit")!!

app/src/main/java/cc/chenhe/qqnotifyevo/service/UpgradeService.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,11 @@ class UpgradeService : Service() {
172172

173173
private suspend fun migrate_1_to_2_0_2() = withContext(Dispatchers.Main) {
174174
if (UserManagerCompat.isUserUnlocked(ctx)) {
175+
Timber.tag(TAG).d("Move default preferences to device protected area.")
176+
val deviceCtx = ctx.createDeviceProtectedStorageContext()
177+
deviceCtx.moveSharedPreferencesFrom(ctx, ctx.packageName + "_preferences")
175178
Timber.tag(TAG).d("Remove deprecated preferences.")
176-
PreferenceManager.getDefaultSharedPreferences(ctx).edit {
179+
PreferenceManager.getDefaultSharedPreferences(deviceCtx).edit {
177180
remove("friend_vibrate")
178181
remove("friend_ringtone")
179182
remove("group_notify")

app/src/main/java/cc/chenhe/qqnotifyevo/utils/PreferencesUtils.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ const val ICON_TIM = 2
3737
@IntDef(ICON_AUTO, ICON_QQ, ICON_TIM)
3838
annotation class Icon
3939

40-
private fun sp(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
40+
private fun sp(context: Context): SharedPreferences = PreferenceManager
41+
.getDefaultSharedPreferences(context.createDeviceProtectedStorageContext())
4142

4243
// ---------------------------------------------------------
4344
// Tips
@@ -51,8 +52,7 @@ fun nevoMultiMsgTip(context: Context, shouldShow: Boolean) {
5152
}
5253
}
5354

54-
fun nevoMultiMsgTip(context: Context): Boolean = PreferenceManager
55-
.getDefaultSharedPreferences(context).getBoolean(PREF_NEVO_MULTI_MSG_TIP, true)
55+
fun nevoMultiMsgTip(context: Context): Boolean = sp(context).getBoolean(PREF_NEVO_MULTI_MSG_TIP, true)
5656

5757

5858
// ---------------------------------------------------------

0 commit comments

Comments
 (0)