wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3021 from MJ10/master

Browse source 
Fix: import/export maintains account order
This commit is contained in:
cketti 2018-01-02 15:29:15 +01:00 committed by GitHub
commit f1deeb76d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java
View file

@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -155,7 +156,7 @@ public class SettingsExporter {
Set<String> exportAccounts; Set<String> exportAccounts;
if (accountUuids == null) { if (accountUuids == null) {
List<Account> accounts = preferences.getAccounts(); List<Account> accounts = preferences.getAccounts();
exportAccounts = new HashSet<>(); exportAccounts = new LinkedHashSet<>();
for (Account account : accounts) { for (Account account : accounts) {
exportAccounts.add(account.getUuid()); exportAccounts.add(account.getUuid());
} }

3
k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
View file

@ -7,6 +7,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -804,7 +805,7 @@ public class SettingsImporter {
String element = xpp.getName(); String element = xpp.getName();
if (SettingsExporter.ACCOUNT_ELEMENT.equals(element)) { if (SettingsExporter.ACCOUNT_ELEMENT.equals(element)) {
if (accounts == null) { if (accounts == null) {
accounts = new HashMap<>(); accounts = new LinkedHashMap<>();
} }
ImportedAccount account = parseAccount(xpp, accountUuids, overview); ImportedAccount account = parseAccount(xpp, accountUuids, overview);