From 13586d7b797cd6ce9ec967e2657a0180340dcfb5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 11 Nov 2018 11:35:12 +0100
Subject: try to fix failing backups in multiaccount mode

--> you have to enable multiaccount mode again and setup a password!!!
---
 .../java/de/pixart/messenger/services/XmppConnectionService.java  | 2 +-
 src/main/java/de/pixart/messenger/ui/SettingsActivity.java        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 3588f836b..54e86a6ab 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -800,7 +800,7 @@ public class XmppConnectionService extends Service {
         final SharedPreferences.Editor editor = getPreferences().edit();
         Log.d(Config.LOGTAG, "Number of accounts is " + accounts);
         editor.putInt(SettingsActivity.NUMBER_OF_ACCOUNTS, accounts);
-        editor.apply();
+        editor.commit();
     }
 
     public boolean isDataSaverDisabled() {
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index 5d3b0cfd7..6f5cd2f0d 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -103,7 +103,7 @@ public class SettingsActivity extends XmppActivity implements
         multiAccountPreference = mSettingsFragment.findPreference("enable_multi_accounts");
         if (multiAccountPreference != null) {
             isMultiAccountChecked = ((CheckBoxPreference) multiAccountPreference).isChecked();
-            handleMultiAccountChanges();
+            //handleMultiAccountChanges();
         }
 
         BundledEmojiPreference = mSettingsFragment.findPreference("use_bundled_emoji");
@@ -290,7 +290,7 @@ public class SettingsActivity extends XmppActivity implements
             if (isMultiAccountChecked) {
                 enableMultiAccountsPreference.setEnabled(false);
                 int accounts = getNumberOfAccounts();
-                Log.d(Config.LOGTAG, "Disabled multi account: Number of accounts " + accounts);
+                Log.d(Config.LOGTAG, "Disable multi account: Number of accounts " + accounts);
                 if (accounts > 1) {
                     Log.d(Config.LOGTAG, "Disabling multi account not possible because you have more than one account");
                     enableMultiAccountsPreference.setEnabled(false);
@@ -484,7 +484,7 @@ public class SettingsActivity extends XmppActivity implements
                                 if (passwordstored) {
                                     recreate();
                                 } else {
-                                    handleMultiAccountChanges();
+                                    //handleMultiAccountChanges();
                                 }
                             }
                         })
@@ -573,7 +573,7 @@ public class SettingsActivity extends XmppActivity implements
 
     public void refreshUiReal() {
         recreate();
-        handleMultiAccountChanges();
+        //handleMultiAccountChanges();
     }
 
     private void handleMultiAccountChanges() {
-- 
cgit v1.2.3