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

Added code to skip some account settings on export

Browse Source
This commit is contained in:
cketti 2011-10-03 20:16:02 +02:00
parent dfa97cd878
commit 33ae5ff7d0
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,16 +68,35 @@ public class StorageExporter {
*/ */
private static final Set<String> SKIP_GLOBAL_SETTINGS; private static final Set<String> SKIP_GLOBAL_SETTINGS;
/**
* List of keys of account settings that don't need to or shouldn't be exported.
*/
private static final Set<String> SKIP_ACCOUNT_SETTINGS;
static { static {
Set<String> skip = new HashSet<String>(); Set<String> skipGlobal = new HashSet<String>();
// No need to export the "accountUuids" field. It will be (re)created by the import code. // No need to export the "accountUuids" field. It will be (re)created by the import code.
skip.add("accountUuids"); skipGlobal.add("accountUuids");
// "defaultAccountUuid" is also handled by the import code. // "defaultAccountUuid" is also handled by the import code.
skip.add("defaultAccountUuid"); skipGlobal.add("defaultAccountUuid");
SKIP_GLOBAL_SETTINGS = skip; SKIP_GLOBAL_SETTINGS = skipGlobal;
Set<String> skipAccount = new HashSet<String>();
// No need to export the "accountNumber" field. It will be (re)created by the import code.
skipAccount.add("accountNumber");
// The values for the following keys get their own XML element in the export file and
// therefore don't need to be stored with the other account settings.
skipAccount.add(Account.ACCOUNT_DESCRIPTION_KEY);
skipAccount.add(Account.STORE_URI_KEY);
skipAccount.add(Account.TRANSPORT_URI_KEY);
SKIP_ACCOUNT_SETTINGS = skipAccount;
} }
@ -282,10 +301,7 @@ public class StorageExporter {
String keyUuid = comps[0]; String keyUuid = comps[0];
String secondPart = comps[1]; String secondPart = comps[1];
if (!keyUuid.equals(accountUuid) if (!keyUuid.equals(accountUuid) || SKIP_ACCOUNT_SETTINGS.contains(secondPart)) {
|| Account.ACCOUNT_DESCRIPTION_KEY.equals(secondPart)
|| "storeUri".equals(secondPart)
|| "transportUri".equals(secondPart)) {
continue; continue;
} }
if (comps.length == 3) { if (comps.length == 3) {