SettingsImporter::getImportStreamContents throw exception when both g…

…lobal and account setting is absent
thunderbird · Jan 10, 2025 · 79bfeb4 · 79bfeb4
1 parent fb561e3
commit 79bfeb4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt
@@ -30,7 +30,7 @@ class SettingsImporter internal constructor(
      *
      * @throws SettingsImportExportException In case of an error.
      */
-    @Suppress("TooGenericExceptionCaught")
+    @Suppress("TooGenericExceptionCaught", "ThrowsCount")
     @Throws(SettingsImportExportException::class)
     fun getImportStreamContents(inputStream: InputStream): ImportContents {
         try {
@@ -46,7 +46,11 @@ class SettingsImporter internal constructor(
                 )
             }
 
-            // TODO: throw exception if neither global settings nor account settings could be found
+            val hasAccountsWithSettings = imported.accounts.any { it.settings != null }
+            if (!globalSettings && !hasAccountsWithSettings) {
+                throw SettingsImportExportException("Neither global settings nor account settings could be found")
+            }
+
             return ImportContents(globalSettings, accounts)
         } catch (e: SettingsImportExportException) {
             throw e

diff --git a/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt b/legacy/core/src/test/java/com/fsck/k9/preferences/SettingsImporterTest.kt
@@ -269,6 +269,9 @@ class SettingsImporterTest : K9RobolectricTest() {
                       <email>[email protected]</email>
                     </identity>
                   </identities>
+                  <settings>
+                    <value key="a">b</value>
+                  </settings>
                 </account>
               </accounts>
             </k9settings>
@@ -302,6 +305,9 @@ class SettingsImporterTest : K9RobolectricTest() {
                       <email>[email protected]</email>
                     </identity>
                   </identities>
+                  <settings>
+                    <value key="a">b</value>
+                  </settings>
                 </account>
               </accounts>
             </k9settings>
@@ -320,4 +326,28 @@ class SettingsImporterTest : K9RobolectricTest() {
             }
         }
     }
+
+    @Test
+    fun `getImportStreamContents() should throw when no setting is present in inputStream`() {
+        val accountUuid = UUID.randomUUID().toString()
+        val inputStream =
+            """
+            <k9settings format="1" version="1">
+              <accounts>
+                <account uuid="$accountUuid">
+                  <name></name>
+                  <identities>
+                    <identity>
+                      <email>[email protected]</email>
+                    </identity>
+                  </identities>
+                </account>
+              </accounts>
+            </k9settings>
+            """.trimIndent().byteInputStream()
+
+        assertFailure {
+            settingsImporter.getImportStreamContents(inputStream)
+        }.isInstanceOf<SettingsImportExportException>()
+    }
 }