Merge pull request #14 from duckduckgo/ema/android-fixes

Android fixes
duckduckgo · Aug 3, 2021 · 8a08e93 · 8a08e93
2 parents f8ae3c1 + c23356f
commit 8a08e93
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/dist/autofill.js b/dist/autofill.js
@@ -262,7 +262,12 @@ class AndroidInterface extends InterfacePrototype {
       alias
     }) => alias);
 
-    this.isDeviceSignedIn = () => window.EmailInterface.isSignedIn() === 'true';
+    this.isDeviceSignedIn = () => {
+      // isDeviceSignedIn is only available on DDG domains...
+      if (isDDGDomain()) return window.EmailInterface.isSignedIn() === 'true'; // ...on other domains we assume true because the script wouldn't exist otherwise
+
+      return true;
+    };
 
     this.setupAutofill = ({
       shouldLog

diff --git a/src/DeviceInterface.js b/src/DeviceInterface.js
@@ -196,7 +196,13 @@ class AndroidInterface extends InterfacePrototype {
             window.EmailInterface.showTooltip(), 'getAliasResponse')
             .then(({alias}) => alias)
 
-        this.isDeviceSignedIn = () => window.EmailInterface.isSignedIn() === 'true'
+        this.isDeviceSignedIn = () => {
+            // isDeviceSignedIn is only available on DDG domains...
+            if (isDDGDomain()) return window.EmailInterface.isSignedIn() === 'true'
+
+            // ...on other domains we assume true because the script wouldn't exist otherwise
+            return true
+        }
 
         this.setupAutofill = ({shouldLog} = {shouldLog: false}) => {
             if (this.isDeviceSignedIn()) {