Merge pull request #1641 from alexbakker/fix-1605

Fall back to default values in the FreeOTP importer

Author: michaelschattgen

app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java

@@ -298,8 +298,8 @@ public Result convert() {
         private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
             try {
                 String type = obj.getString("type").toLowerCase(Locale.ROOT);
-                String algo = obj.getString("algo");
-                int digits = obj.getInt("digits");
+                String algo = obj.optString("algo", OtpInfo.DEFAULT_ALGORITHM);
+                int digits = obj.optInt("digits", OtpInfo.DEFAULT_DIGITS);
                 byte[] secret = toBytes(obj.getJSONArray("secret"));
 
                 String issuer = obj.getString("issuerExt");
@@ -308,7 +308,7 @@ private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEn
                 OtpInfo info;
                 switch (type) {
                     case "totp":
-                        int period = obj.getInt("period");
+                        int period = obj.optInt("period", TotpInfo.DEFAULT_PERIOD);
                         if (issuer.equals("Steam")) {
                             info = new SteamInfo(secret, algo, digits, period);
                         } else {

app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java

@@ -257,6 +257,15 @@ public void testImportFreeOtpV2Api34() throws IOException, DatabaseImporterExcep
         checkImportedEntries(entries);
     }
 
+    @Test
+    public void testImportFreeOtpV2NullAlgo() throws IOException, DatabaseImporterException, OtpInfoException {
+        List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_null_algo.xml", encryptedState -> {
+            final char[] password = "test".toCharArray();
+            return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
+        });
+        checkImportedEntries(entries);
+    }
+
     @Test
     public void testImportFreeOtpPlus() throws IOException, DatabaseImporterException, OtpInfoException {
         List<VaultEntry> entries = importPlain(FreeOtpPlusImporter.class, "freeotp_plus.json");