Support Direct Boot mode

4 files changed, 15 insertions, 6 deletions

diff --git a/java/src/org/kelar/inputmethod/latin/settings/AdvancedSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/AdvancedSettingsFragment.java
index 9f3df399e..fd487cb91 100644
--- a/java/src/org/kelar/inputmethod/latin/settings/AdvancedSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/AdvancedSettingsFragment.java
@@ -26,6 +26,7 @@ import android.preference.ListPreference;
 import org.kelar.inputmethod.latin.AudioAndHapticFeedbackManager;
 import org.kelar.inputmethod.latin.R;
 import org.kelar.inputmethod.latin.SystemBroadcastReceiver;
+import org.kelar.inputmethod.latin.utils.PreferenceUtils;
 
 /**
  * "Advanced" settings sub screen.
@@ -52,7 +53,7 @@ public final class AdvancedSettingsFragment extends SubScreenFragment {
         // initialization method of these classes here. See {@link LatinIME#onCreate()}.
         AudioAndHapticFeedbackManager.init(context);
 
-        final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
+        final SharedPreferences prefs = PreferenceUtils.getDefaultSharedPreferences(context);
 
         if (!Settings.isInternal(prefs)) {
             removePreference(Settings.SCREEN_DEBUG);
@@ -95,7 +96,7 @@ public final class AdvancedSettingsFragment extends SubScreenFragment {
     @Override
     public void onResume() {
         super.onResume();
-        final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
+        final SharedPreferences prefs = PreferenceUtils.getDefaultSharedPreferences(getActivity());
         updateListPreferenceSummaryToCurrentValue(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY);
     }
 
diff --git a/java/src/org/kelar/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
index 2e83719f2..dbaff67b8 100644
--- a/java/src/org/kelar/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
@@ -43,6 +43,7 @@ import org.kelar.inputmethod.latin.RichInputMethodManager;
 import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
 import org.kelar.inputmethod.latin.utils.DialogUtils;
 import org.kelar.inputmethod.latin.utils.IntentUtils;
+import org.kelar.inputmethod.latin.utils.PreferenceUtils;
 import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
@@ -95,7 +96,7 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mPrefs = getPreferenceManager().getSharedPreferences();
+        mPrefs = PreferenceUtils.getDefaultSharedPreferences(getActivity());
         RichInputMethodManager.init(getActivity());
         mRichImm = RichInputMethodManager.getInstance();
         addPreferencesFromResource(R.xml.additional_subtype_settings);
diff --git a/java/src/org/kelar/inputmethod/latin/settings/Settings.java b/java/src/org/kelar/inputmethod/latin/settings/Settings.java
index c16caddb2..62f87c9f7 100644
--- a/java/src/org/kelar/inputmethod/latin/settings/Settings.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/Settings.java
@@ -22,7 +22,6 @@ import android.content.pm.ApplicationInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
 import org.kelar.inputmethod.compat.BuildCompatUtils;
@@ -31,6 +30,7 @@ import org.kelar.inputmethod.latin.InputAttributes;
 import org.kelar.inputmethod.latin.R;
 import org.kelar.inputmethod.latin.common.StringUtils;
 import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.PreferenceUtils;
 import org.kelar.inputmethod.latin.utils.ResourceUtils;
 import org.kelar.inputmethod.latin.utils.RunInLocale;
 import org.kelar.inputmethod.latin.utils.StatsUtils;
@@ -143,7 +143,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     private void onCreate(final Context context) {
         mContext = context;
         mRes = context.getResources();
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        mPrefs = PreferenceUtils.getDefaultSharedPreferences(context);
         mPrefs.registerOnSharedPreferenceChangeListener(this);
         upgradeAutocorrectionSettings(mPrefs, mRes);
     }
diff --git a/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java b/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
index 08c9bd441..9e3edabda 100644
--- a/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -28,6 +29,9 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.latin.utils.PreferenceUtils;
+
 /**
  * A base abstract class for a {@link PreferenceFragment} that implements a nested
  * {@link PreferenceScreen} of the main preference screen.
@@ -77,7 +81,7 @@ public abstract class SubScreenFragment extends PreferenceFragment
     }
 
     final SharedPreferences getSharedPreferences() {
-        return getPreferenceManager().getSharedPreferences();
+        return PreferenceUtils.getDefaultSharedPreferences(getActivity());
     }
 
     /**
@@ -100,6 +104,9 @@ public abstract class SubScreenFragment extends PreferenceFragment
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (BuildCompatUtils.EFFECTIVE_SDK_INT >= Build.VERSION_CODES.N) {
+            super.getPreferenceManager().setStorageDeviceProtected();
+        }
         mSharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {