aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-11-11 11:35:12 +0100
committerChristian Schneppe <christian@pix-art.de>2018-11-11 11:35:12 +0100
commit13586d7b797cd6ce9ec967e2657a0180340dcfb5 (patch)
treef44e06ce2ea033a9eed672c8348dcf3daa2dd21b /src
parentd693a29586586b46588885a711b446748344e180 (diff)
try to fix failing backups in multiaccount mode
--> you have to enable multiaccount mode again and setup a password!!!
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/SettingsActivity.java8
2 files changed, 5 insertions, 5 deletions
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() {