fix(popup): add fallback if localstorage is disabled; #338

sereneblue · May 2, 2020 · a5254ee · a5254ee
1 parent d41a388
commit a5254ee
Showing 1 changed file with 29 additions and 20 deletions.
diff --git a/src/popup/App.vue b/src/popup/App.vue
@@ -899,22 +899,40 @@ export default class App extends Vue {
 
     await this['$store'].dispatch('initialize');
 
-    let version = localStorage.getItem('version');
-    let needsUpdate: boolean = false;
+    if (localStorage != null) {
+      let needsUpdate: boolean = false;
+      let version = localStorage.getItem('version');
 
-    if (version === null || version != this.settings.version) {
-      localStorage.setItem('version', this.settings.version);
-      needsUpdate = true;
-    }
+      if (version === null || version != this.settings.version) {
+        localStorage.setItem('version', this.settings.version);
+        needsUpdate = true;
+      }
+
+      let localizations = localStorage.getItem('localizations');
+      if (localizations === null || needsUpdate) {
+        this.localizations = await browser.runtime.sendMessage({
+          action: 'localize',
+        });
+        localStorage.setItem('localizations', JSON.stringify(this.localizations));
+      } else {
+        this.localizations = JSON.parse(localizations);
+      }
 
-    let localizations = localStorage.getItem('localizations');
-    if (localizations === null || needsUpdate) {
+      let isDesktop = localStorage.getItem('isDesktop');
+      if (isDesktop === null) {
+        let platform = await browser.runtime.getPlatformInfo();
+        this.isDesktop = platform.os != 'android';
+        localStorage.setItem('isDesktop', JSON.stringify(this.isDesktop));
+      } else {
+        this.isDesktop = JSON.parse(isDesktop);
+      }
+    } else {
       this.localizations = await browser.runtime.sendMessage({
         action: 'localize',
       });
-      localStorage.setItem('localizations', JSON.stringify(this.localizations));
-    } else {
-      this.localizations = JSON.parse(localizations);
+
+      let platform = await browser.runtime.getPlatformInfo();
+      this.isDesktop = platform.os != 'android';
     }
 
     this.getCurrentPage();
@@ -938,15 +956,6 @@ export default class App extends Vue {
     this.tmp.rangeFrom = this.settings.headers.spoofIP.rangeFrom;
     this.tmp.rangeTo = this.settings.headers.spoofIP.rangeTo;
 
-    let isDesktop = localStorage.getItem('isDesktop');
-    if (isDesktop === null) {
-      let platform = await browser.runtime.getPlatformInfo();
-      this.isDesktop = platform.os != 'android';
-      localStorage.setItem('isDesktop', JSON.stringify(this.isDesktop));
-    } else {
-      this.isDesktop = JSON.parse(isDesktop);
-    }
-
     if (this.isDesktop) {
       let detectedFP = await browser.runtime.sendMessage({
         action: 'getTabFP',