Add support from importing from 2FAS Authenticator

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

@@ -27,6 +27,7 @@ public abstract class DatabaseImporter {
     static {
         // note: keep these lists sorted alphabetically
         _importers = new ArrayList<>();
+        _importers.add(new Definition("2FAS Authenticator", TwoFASImporter.class, R.string.importer_help_2fas, false));
         _importers.add(new Definition("Aegis", AegisImporter.class, R.string.importer_help_aegis, false));
         _importers.add(new Definition("andOTP", AndOtpImporter.class, R.string.importer_help_andotp, false));
         _importers.add(new Definition("Authenticator Plus", AuthenticatorPlusImporter.class, R.string.importer_help_authenticator_plus, false));

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

@@ -0,0 +1,94 @@
+package com.beemdevelopment.aegis.importers;
+
+import android.content.Context;
+
+import com.beemdevelopment.aegis.encoding.Base32;
+import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.OtpInfo;
+import com.beemdevelopment.aegis.otp.OtpInfoException;
+import com.beemdevelopment.aegis.otp.TotpInfo;
+import com.beemdevelopment.aegis.util.IOUtils;
+import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.topjohnwu.superuser.io.SuFile;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TwoFASImporter extends DatabaseImporter {
+    public TwoFASImporter(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected SuFile getAppPath() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public State read(InputStream stream, boolean isInternal) throws DatabaseImporterException {
+        try {
+            String json = new String(IOUtils.readAll(stream), StandardCharsets.UTF_8);
+            JSONObject obj = new JSONObject(json);
+            int version = obj.getInt("schemaVersion");
+            if (version > 1) {
+                throw new DatabaseImporterException(String.format("Unsupported schema version: %d", version));
+            }
+
+            JSONArray array = obj.getJSONArray("services");
+            List<JSONObject> entries = new ArrayList<>();
+            for (int i = 0; i < array.length(); i++) {
+                entries.add(array.getJSONObject(i));
+            }
+
+            return new TwoFASImporter.State(entries);
+        } catch (IOException | JSONException e) {
+            throw new DatabaseImporterException(e);
+        }
+    }
+
+    public static class State extends DatabaseImporter.State {
+        private final List<JSONObject> _entries;
+
+        public State(List<JSONObject> entries) {
+            super(false);
+            _entries = entries;
+        }
+
+        @Override
+        public Result convert() {
+            Result result = new Result();
+
+            for (JSONObject obj : _entries) {
+                try {
+                    VaultEntry entry = convertEntry(obj);
+                    result.addEntry(entry);
+                } catch (DatabaseImporterEntryException e) {
+                    result.addError(e);
+                }
+            }
+
+            return result;
+        }
+
+        private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
+            try {
+                byte[] secret = Base32.decode(obj.getString("secret"));
+                JSONObject info = obj.getJSONObject("otp");
+                String issuer = info.getString("issuer");
+                String name = info.optString("account");
+
+                OtpInfo otp = new TotpInfo(secret);
+                return new VaultEntry(otp, name, issuer);
+            } catch (OtpInfoException | JSONException | EncodingException e) {
+                throw new DatabaseImporterEntryException(e, obj.toString());
+            }
+        }
+    }
+}

app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/Dialogs.java

@@ -46,6 +46,7 @@ import com.nulabinc.zxcvbn.Zxcvbn;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import javax.crypto.Cipher;
 
@@ -399,14 +400,15 @@ public class Dialogs {
 
     public static void showImportersDialog(Context context, boolean isDirect, ImporterListener listener) {
         List<DatabaseImporter.Definition> importers = DatabaseImporter.getImporters(isDirect);
-        String[] names = importers.stream().map(DatabaseImporter.Definition::getName).toArray(String[]::new);
+        List<String> names = importers.stream().map(DatabaseImporter.Definition::getName).collect(Collectors.toList());
 
+        int i = names.indexOf(context.getString(R.string.app_name));
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_importers, null);
         TextView helpText = view.findViewById(R.id.text_importer_help);
-        setImporterHelpText(helpText, importers.get(0), isDirect);
+        setImporterHelpText(helpText, importers.get(i), isDirect);
         ListView listView = view.findViewById(R.id.list_importers);
         listView.setAdapter(new ArrayAdapter<>(context, R.layout.card_importer, names));
-        listView.setItemChecked(0, true);
+        listView.setItemChecked(i, true);
         listView.setOnItemClickListener((parent, view1, position, id) -> {
             setImporterHelpText(helpText, importers.get(position), isDirect);
         });