moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Write identity elements in correct order (export)

Browse Source
This commit is contained in:
cketti 2011-03-30 05:08:49 +02:00
parent 29c42eb1a3
commit 6258118ed6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/fsck/k9/preferences/StorageExporter.java
View File

@ -4,7 +4,10 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlSerializer;
@ -140,7 +143,7 @@ public class StorageExporter {
private static void writeAccount(XmlSerializer serializer, String accountUuid, private static void writeAccount(XmlSerializer serializer, String accountUuid,
Map<String, ? extends Object> prefs) throws IOException { Map<String, ? extends Object> prefs) throws IOException {
Set<String> identities = new HashSet<String>(); Set<Integer> identities = new HashSet<Integer>();
Set<String> folders = new HashSet<String>(); Set<String> folders = new HashSet<String>();
serializer.startTag(null, ACCOUNT_ELEMENT); serializer.startTag(null, ACCOUNT_ELEMENT);
@ -162,7 +165,9 @@ public class StorageExporter {
if (Account.IDENTITY_KEYS.contains(secondPart)) { if (Account.IDENTITY_KEYS.contains(secondPart)) {
// This is an identity key. Save identity index for later... // This is an identity key. Save identity index for later...
identities.add(thirdPart); try {
identities.add(Integer.parseInt(thirdPart));
} catch (NumberFormatException e) { /* ignore */ }
// ... but don't write it now. // ... but don't write it now.
continue; continue;
} }
@ -191,8 +196,13 @@ public class StorageExporter {
if (identities.size() > 0) { if (identities.size() > 0) {
serializer.startTag(null, IDENTITIES_ELEMENT); serializer.startTag(null, IDENTITIES_ELEMENT);
for (String identityIndex : identities) {
writeIdentity(serializer, accountUuid, identityIndex, prefs); // Sort identity indices (that's why we store them as Integers)
List<Integer> sortedIdentities = new ArrayList<Integer>(identities);
Collections.sort(sortedIdentities);
for (Integer identityIndex : sortedIdentities) {
writeIdentity(serializer, accountUuid, identityIndex.toString(), prefs);
} }
serializer.endTag(null, IDENTITIES_ELEMENT); serializer.endTag(null, IDENTITIES_ELEMENT);
} }