From ad4c7f707158e758bf3bcbf955ec95b6bd8588f0 Mon Sep 17 00:00:00 2001 From: danapple Date: Sun, 27 Mar 2011 15:27:14 -0500 Subject: [PATCH] UUIDs could have been generated by different generators within the same instance due to local upgrades of K-9 Mail. --- src/com/fsck/k9/preferences/StorageImporterEncryptedXml.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/fsck/k9/preferences/StorageImporterEncryptedXml.java b/src/com/fsck/k9/preferences/StorageImporterEncryptedXml.java index af7977e0e..0707fa133 100644 --- a/src/com/fsck/k9/preferences/StorageImporterEncryptedXml.java +++ b/src/com/fsck/k9/preferences/StorageImporterEncryptedXml.java @@ -27,9 +27,8 @@ public class StorageImporterEncryptedXml implements IStorageImporter { * We translate UUIDs in the import file into new UUIDs in the local instance for the following reasons: * 1) Accidentally importing the same file twice cannot damage settings in an existing account. * (Say, an account that was imported two months ago and has since had significant settings changes.) - * 2) All UUIDs used in the local instance will be generated with the same generator. - * 3) Importing a single file multiple times allows for creating multiple accounts from the same template. - * 4) Exporting an account and importing back into the same instance is a poor-man's account copy (until a real + * 2) Importing a single file multiple times allows for creating multiple accounts from the same template. + * 3) Exporting an account and importing back into the same instance is a poor-man's account copy (until a real * copy function is created, if ever) */ Map uuidMapping = new HashMap();