Merge pull request #3736 from nextcloud/refactor-reinit-keys-preference

Move re-init keys pref to AppPreferences

src/generic/java/com/owncloud/android/utils/PushUtils.java

@@ -40,7 +40,7 @@ public final class PushUtils {
 
     public static void reinitKeys() {
         Context context = MainApp.getAppContext();
-        PreferenceManager.setKeysReInit(context);
+        PreferenceManager.fromContext(context).setKeysReInitEnabled();
     }
 
     public static Key readKeyFromFile(boolean readPublicKey) {

src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -374,7 +374,7 @@ public final class PushUtils {
         FileUtils.deleteQuietly(publicKeyFile);
 
         pushRegistrationToServer();
-        PreferenceManager.setKeysReInit(context);
+        PreferenceManager.fromContext(context).setKeysReInitEnabled();
     }
 
     private static void migratePushKeys() {

src/main/java/com/nextcloud/client/preferences/AppPreferences.java

@@ -24,6 +24,9 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.utils.FileSortOrder;
 
 public interface AppPreferences {
+    void setKeysReInitEnabled();
+    boolean isKeysReInitEnabled();
+
     boolean instantPictureUploadEnabled();
     boolean instantVideoUploadEnabled();
 

src/main/java/com/nextcloud/client/preferences/PreferenceManager.java

@@ -78,12 +78,14 @@ public final class PreferenceManager implements AppPreferences {
         this.preferences = preferences;
     }
 
-    public static void setKeysReInit(Context context) {
-        saveBooleanPreference(context, PREF__KEYS_REINIT, true);
+    @Override
+    public void setKeysReInitEnabled() {
+        preferences.edit().putBoolean(PREF__KEYS_REINIT, true).apply();
     }
 
-    public static boolean getKeysReInit(Context context) {
-        return getDefaultSharedPreferences(context).getBoolean(PREF__KEYS_REINIT, false);
+    @Override
+    public boolean isKeysReInitEnabled() {
+        return preferences.getBoolean(PREF__KEYS_REINIT, false);
     }
 
     public static void setPushToken(Context context, String pushToken) {

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -2563,7 +2563,7 @@ public class FileDisplayActivity extends HookActivity
 
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onMessageEvent(TokenPushEvent event) {
-        if (!PreferenceManager.getKeysReInit(getApplicationContext())) {
+        if (!preferences.isKeysReInitEnabled()) {
             PushUtils.reinitKeys();
         } else {
             PushUtils.pushRegistrationToServer();

src/versionDev/java/com/owncloud/android/utils/PushUtils.java

@@ -40,7 +40,7 @@ public final class PushUtils {
 
     public static void reinitKeys() {
         Context context = MainApp.getAppContext();
-        PreferenceManager.setKeysReInit(context);
+        PreferenceManager.fromContext(context).setKeysReInitEnabled();
     }
 
     public static Key readKeyFromFile(boolean readPublicKey) {