From 951241e95d5458c033964a81a5dcdf6533e875bc Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sat, 2 Jan 2021 14:55:26 +0100 Subject: [PATCH] Don't rely on accountType to detect proprietary Authy tokens --- .../com/beemdevelopment/aegis/importers/AuthyImporter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java index f334f9c2..f3c7f7e6 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java +++ b/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java @@ -235,7 +235,7 @@ public class AuthyImporter extends DatabaseImporter { authyEntryInfo.AccountType = JsonUtils.optString(entry, "accountType"); authyEntryInfo.Name = entry.optString("name"); - boolean isAuthy = !entry.optString("accountType", "authy").equals("authenticator"); + boolean isAuthy = entry.has("secretSeed"); sanitizeEntryInfo(authyEntryInfo, isAuthy); byte[] secret; @@ -246,7 +246,7 @@ public class AuthyImporter extends DatabaseImporter { } int digits = entry.getInt("digits"); - OtpInfo info = new TotpInfo(secret, "SHA1", digits, digits == 7 ? 10 : 30); + OtpInfo info = new TotpInfo(secret, "SHA1", digits, isAuthy ? 10 : 30); return new VaultEntry(info, authyEntryInfo.Name, authyEntryInfo.Issuer); } catch (OtpInfoException | JSONException | EncodingException e) { throw new DatabaseImporterEntryException(e, entry.toString());