From 1de28150e2930859b89e03e47d982297eaadf737 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sun, 9 Oct 2011 01:23:45 +0200
Subject: [PATCH] Require accounts to at least have one identity when importing

---
 src/com/fsck/k9/preferences/StorageImporter.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/fsck/k9/preferences/StorageImporter.java b/src/com/fsck/k9/preferences/StorageImporter.java
index d0e0504ce..ac0968f01 100644
--- a/src/com/fsck/k9/preferences/StorageImporter.java
+++ b/src/com/fsck/k9/preferences/StorageImporter.java
@@ -378,6 +378,9 @@ public class StorageImporter {
         // Write identities
         if (account.identities != null) {
             importIdentities(editor, uuid, account, overwrite, existingAccount, prefs);
+        } else if (!mergeImportedAccount) {
+            // Require accounts to at least have one identity
+            throw new InvalidSettingValueException();
         }
 
         // Write folder settings