From a396de3e322881d8a3fb4a53ff789d9cbb276ece Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Wed, 15 Jan 2020 12:17:15 -0600
Subject: [PATCH 1/3] remove validity checks in getDecryptedSecret

---
 src/models/encryption.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/models/encryption.ts b/src/models/encryption.ts
index 5fa187946..6cf506dcc 100644
--- a/src/models/encryption.ts
+++ b/src/models/encryption.ts
@@ -26,20 +26,6 @@ export class Encryption implements IEncryption {
         return null;
       }
 
-      if (decryptedSecret.length < 8) {
-        return null;
-      }
-
-      if (
-        !/^[a-z2-7]+=*$/i.test(decryptedSecret) &&
-        !/^[0-9a-f]+$/i.test(decryptedSecret) &&
-        !/^blz\-/.test(decryptedSecret) &&
-        !/^bliz\-/.test(decryptedSecret) &&
-        !/^stm\-/.test(decryptedSecret)
-      ) {
-        return null;
-      }
-
       return decryptedSecret;
     } catch (error) {
       return null;

From fe8a6c3083c70e003905831761901f3dc2fa1f81 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Wed, 15 Jan 2020 12:21:06 -0600
Subject: [PATCH 2/3] add length check to manual add account page

---
 src/components/Popup/AddAccountPage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/Popup/AddAccountPage.vue b/src/components/Popup/AddAccountPage.vue
index 72e7e4f73..d44738dda 100644
--- a/src/components/Popup/AddAccountPage.vue
+++ b/src/components/Popup/AddAccountPage.vue
@@ -57,6 +57,11 @@ export default Vue.extend({
     async addNewAccount() {
       this.newAccount.secret = this.newAccount.secret.replace(/ /g, "");
 
+      if (this.newAccount.secret.length < 16) {
+        this.$store.commit("notification/alert", this.i18n.errorsecret);
+        return;
+      }
+
       if (
         !/^[a-z2-7]+=*$/i.test(this.newAccount.secret) &&
         !/^[0-9a-f]+$/i.test(this.newAccount.secret)

From a567d3962a7b16c2e499624e83b41c4e37d730ed Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Mon, 20 Jan 2020 11:13:19 -0600
Subject: [PATCH 3/3] Revert "remove validity checks in getDecryptedSecret"

This reverts commit a396de3e322881d8a3fb4a53ff789d9cbb276ece.
---
 src/models/encryption.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/models/encryption.ts b/src/models/encryption.ts
index 6cf506dcc..5fa187946 100644
--- a/src/models/encryption.ts
+++ b/src/models/encryption.ts
@@ -26,6 +26,20 @@ export class Encryption implements IEncryption {
         return null;
       }
 
+      if (decryptedSecret.length < 8) {
+        return null;
+      }
+
+      if (
+        !/^[a-z2-7]+=*$/i.test(decryptedSecret) &&
+        !/^[0-9a-f]+$/i.test(decryptedSecret) &&
+        !/^blz\-/.test(decryptedSecret) &&
+        !/^bliz\-/.test(decryptedSecret) &&
+        !/^stm\-/.test(decryptedSecret)
+      ) {
+        return null;
+      }
+
       return decryptedSecret;
     } catch (error) {
       return null;