From eb4b7b5d612d5234c63a8dcc88edf6e486e783cf Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Thu, 22 Jul 2021 21:07:32 +0200
Subject: [PATCH] Accept spaces and dashes in secrets from Microsoft
 Authenticator

A user reported that importing was failing due to this issue
---
 .../aegis/importers/MicrosoftAuthImporter.java                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/MicrosoftAuthImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/MicrosoftAuthImporter.java
index 62d672b2..f2920e99 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/importers/MicrosoftAuthImporter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/importers/MicrosoftAuthImporter.java
@@ -4,9 +4,9 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 
-import com.beemdevelopment.aegis.encoding.Base32;
 import com.beemdevelopment.aegis.encoding.Base64;
 import com.beemdevelopment.aegis.encoding.EncodingException;
+import com.beemdevelopment.aegis.otp.GoogleAuthInfo;
 import com.beemdevelopment.aegis.otp.OtpInfo;
 import com.beemdevelopment.aegis.otp.OtpInfoException;
 import com.beemdevelopment.aegis.otp.TotpInfo;
@@ -81,7 +81,7 @@ public class MicrosoftAuthImporter extends DatabaseImporter {
 
                 switch (entry.getType()) {
                     case TYPE_TOTP:
-                        secret = Base32.decode(entry.getSecret());
+                        secret = GoogleAuthInfo.parseSecret(entry.getSecret());
                         break;
                     case TYPE_MICROSOFT:
                         digits = 8;