luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-25 08:16:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #338 from orangenbaumblatt/master

Browse source 
Keep groups when importing from Authenticator Plus
This commit is contained in:
Alexander Bakker 2020-03-20 16:23:53 +01:00 • committed by GitHub
commit d89d5eac9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/beemdevelopment/aegis/importers/AuthenticatorPlusImporter.java
View file

@ -101,7 +101,14 @@ public class AuthenticatorPlusImporter extends DatabaseImporter {
name = parts[1]; name = parts[1];
} }
// Authenticator Plus saves all entries to the "All Accounts" category by default
// If an entry is in this category, we can consider it as uncategorized
String group = entry.getGroup();
if (group.equals("All Accounts")) {
return new VaultEntry(info, name, entry.getIssuer()); return new VaultEntry(info, name, entry.getIssuer());
}
return new VaultEntry(info, name, entry.getIssuer(), entry.getGroup());
} catch (EncodingException | OtpInfoException | DatabaseImporterException e) { } catch (EncodingException | OtpInfoException | DatabaseImporterException e) {
throw new DatabaseImporterEntryException(e, entry.toString()); throw new DatabaseImporterEntryException(e, entry.toString());
} }
@ -129,6 +136,7 @@ public class AuthenticatorPlusImporter extends DatabaseImporter {
private String _secret; private String _secret;
private String _email; private String _email;
private String _issuer; private String _issuer;
private String _group;
private long _counter; private long _counter;
public Entry(Cursor cursor) { public Entry(Cursor cursor) {
@ -137,6 +145,7 @@ public class AuthenticatorPlusImporter extends DatabaseImporter {
_secret = SqlImporterHelper.getString(cursor, "secret"); _secret = SqlImporterHelper.getString(cursor, "secret");
_email = SqlImporterHelper.getString(cursor, "email", ""); _email = SqlImporterHelper.getString(cursor, "email", "");
_issuer = SqlImporterHelper.getString(cursor, "issuer", ""); _issuer = SqlImporterHelper.getString(cursor, "issuer", "");
_group = SqlImporterHelper.getString(cursor, "category", "");
_counter = SqlImporterHelper.getLong(cursor, "counter"); _counter = SqlImporterHelper.getLong(cursor, "counter");
} }
@ -156,6 +165,10 @@ public class AuthenticatorPlusImporter extends DatabaseImporter {
return _issuer; return _issuer;
} }
public String getGroup() {
return _group;
}
public long getCounter() { public long getCounter() {
return _counter; return _counter;
} }

7
app/src/main/java/com/beemdevelopment/aegis/vault/VaultEntry.java
View file

@ -38,6 +38,13 @@ public class VaultEntry extends UUIDMap.Value {
setIssuer(issuer); setIssuer(issuer);
} }
public VaultEntry(OtpInfo info, String name, String issuer, String group) {
this(info);
setName(name);
setIssuer(issuer);
setGroup(group);
}
public VaultEntry(GoogleAuthInfo info) { public VaultEntry(GoogleAuthInfo info) {
this(info.getOtpInfo(), info.getAccountName(), info.getIssuer()); this(info.getOtpInfo(), info.getAccountName(), info.getIssuer());
} }