moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

Always reload all accounts after importing one or more accounts

Browse Source
This commit is contained in:
cketti 2011-04-13 03:44:43 +02:00
parent 12d87854ac
commit 8240d7ff10
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/fsck/k9/Preferences.java
View File

@ -49,36 +49,23 @@ public class Preferences {
} }
} }
private synchronized void loadAccounts() { public synchronized void loadAccounts() {
accounts = new HashMap<String, Account>(); accounts = new HashMap<String, Account>();
refreshAccounts();
}
public synchronized void refreshAccounts() {
Map<String, Account> newAccountMap = new HashMap<String, Account>();
accountsInOrder = new LinkedList<Account>(); accountsInOrder = new LinkedList<Account>();
String accountUuids = getPreferences().getString("accountUuids", null); String accountUuids = getPreferences().getString("accountUuids", null);
if ((accountUuids != null) && (accountUuids.length() != 0)) { if ((accountUuids != null) && (accountUuids.length() != 0)) {
String[] uuids = accountUuids.split(","); String[] uuids = accountUuids.split(",");
for (String uuid : uuids) { for (String uuid : uuids) {
Account account = accounts.get(uuid);
if (account != null) {
newAccountMap.put(uuid, account);
accountsInOrder.add(account);
} else {
Account newAccount = new Account(this, uuid); Account newAccount = new Account(this, uuid);
newAccountMap.put(uuid, newAccount); accounts.put(uuid, newAccount);
accountsInOrder.add(newAccount); accountsInOrder.add(newAccount);
} }
} }
}
if ((newAccount != null) && newAccount.getAccountNumber() != -1) { if ((newAccount != null) && newAccount.getAccountNumber() != -1) {
newAccountMap.put(newAccount.getUuid(), newAccount); accounts.put(newAccount.getUuid(), newAccount);
accountsInOrder.add(newAccount); accountsInOrder.add(newAccount);
newAccount = null; newAccount = null;
} }
accounts = newAccountMap;
} }
/** /**

2
src/com/fsck/k9/preferences/StorageImporter.java
View File

@ -178,7 +178,7 @@ public class StorageImporter {
throw new StorageImportExportException("Couldn't save imported settings"); throw new StorageImportExportException("Couldn't save imported settings");
} }
preferences.refreshAccounts(); preferences.loadAccounts();
DateFormatter.clearChosenFormat(); DateFormatter.clearChosenFormat();
K9.loadPrefs(preferences); K9.loadPrefs(preferences);
K9.setServicesEnabled(context); K9.setServicesEnabled(context);