From 571cf20eda35f5ba129305f7d932e0e196c0a88c Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Tue, 2 Oct 2018 21:05:54 +0200
Subject: [PATCH] Reapply the preference fix library

Close #14
---
 app/build.gradle                                            | 3 ++-
 app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e97eb676..43815ebf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,8 @@ dependencies {
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -42,7 +44,6 @@ dependencies {
     implementation 'com.github.esafirm.android-image-picker:imagepicker:1.13.0'
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
     implementation 'com.mattprecious.swirl:swirl:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'me.dm7.barcodescanner:zxing:1.9'
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
index e9eddc4c..191ea6bc 100644
--- a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
@@ -13,6 +13,8 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import com.takisoft.preferencex.PreferenceFragmentCompat;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,7 +24,6 @@ import java.util.Map;
 
 import javax.crypto.Cipher;
 
-import androidx.preference.PreferenceFragmentCompat;
 import me.impy.aegis.AegisApplication;
 import me.impy.aegis.R;
 import me.impy.aegis.crypto.MasterKey;
@@ -62,7 +63,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Pas
     private Preference _slotsPreference;
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferencesFix(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.preferences);
 
         AegisApplication app = (AegisApplication) getActivity().getApplication();