Direct-boot aware preferences

Store preferences in device protected storage, which is available before
the device is unlocked.
The keyboard was crashing when trying to access the encrypted
preferences.

The emoji pane uses a separate preferences file, the old data is lost.

The SettingsActivity can't easily use the new preferences storage.
Instead, it continues to use the "default" preferences store, which is
copied back to the protected storage when needed.

1 files changed, 15 insertions, 0 deletions

diff --git a/srcs/juloo.keyboard2/SettingsActivity.java b/srcs/juloo.keyboard2/SettingsActivity.java
index 98cd590..c6454a7 100644
--- a/srcs/juloo.keyboard2/SettingsActivity.java
+++ b/srcs/juloo.keyboard2/SettingsActivity.java
@@ -1,9 +1,11 @@
 package juloo.keyboard2;
 
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 
 public class SettingsActivity extends PreferenceActivity
 {
@@ -13,6 +15,8 @@ public class SettingsActivity extends PreferenceActivity
     detectSystemTheme();
     super.onCreate(savedInstanceState);
     addPreferencesFromResource(R.xml.settings);
+    PreferenceManager.getDefaultSharedPreferences(this)
+      .registerOnSharedPreferenceChangeListener(this.new OnPreferencesChange());
   }
 
   /** The default theme is [Theme.DeviceDefault], which is dark. Detect if the
@@ -26,4 +30,15 @@ public class SettingsActivity extends PreferenceActivity
         setTheme(android.R.style.Theme_DeviceDefault_Light);
     }
   }
+
+  /** See DirectBootAwarePreferences. */
+  class OnPreferencesChange implements SharedPreferences.OnSharedPreferenceChangeListener
+  {
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences prefs, String _key)
+    {
+      DirectBootAwarePreferences
+        .copy_preferences_to_protected_storage(SettingsActivity.this, prefs);
+    }
+  }
 }