Merge pull request #1137 from jitsi/local-storage

fix(localStorage): Use JitsiLocalStorage.

modules/settings/Settings.js

@@ -1,4 +1,6 @@
 import { getLogger } from 'jitsi-meet-logger';
+import { jitsiLocalStorage } from 'js-utils';
+
 const logger = getLogger(__filename);
 
 import UsernameGenerator from '../util/UsernameGenerator';
@@ -17,18 +19,10 @@ export default {
      */
     get callStatsUserName() {
         if (!_callStatsUserName) {
-            const localStorage = getLocalStorage();
-
-            if (localStorage) {
-                _callStatsUserName = localStorage.getItem('callStatsUserName');
-            }
+            _callStatsUserName = jitsiLocalStorage.getItem('callStatsUserName');
             if (!_callStatsUserName) {
                 _callStatsUserName = generateCallStatsUserName();
-                if (localStorage) {
-                    localStorage.setItem(
-                        'callStatsUserName',
-                        _callStatsUserName);
-                }
+                jitsiLocalStorage.setItem('callStatsUserName', _callStatsUserName);
             }
         }
 
@@ -41,16 +35,10 @@ export default {
      */
     get machineId() {
         if (!_machineId) {
-            const localStorage = getLocalStorage();
-
-            if (localStorage) {
-                _machineId = localStorage.getItem('jitsiMeetId');
-            }
+            _machineId = jitsiLocalStorage.getItem('jitsiMeetId');
             if (!_machineId) {
                 _machineId = generateJitsiMeetId();
-                if (localStorage) {
-                    localStorage.setItem('jitsiMeetId', _machineId);
-                }
+                jitsiLocalStorage.setItem('jitsiMeetId', _machineId);
             }
         }
 
@@ -64,9 +52,7 @@ export default {
     get sessionId() {
         // We may update sessionId in localStorage from another JitsiConference
         // instance and that's why we should always re-read it.
-        const localStorage = getLocalStorage();
-
-        return localStorage ? localStorage.getItem('sessionId') : undefined;
+        return jitsiLocalStorage.getItem('sessionId');
     },
 
     /**
@@ -74,14 +60,10 @@ export default {
      * @param {string} sessionId session id
      */
     set sessionId(sessionId) {
-        const localStorage = getLocalStorage();
-
-        if (localStorage) {
-            if (sessionId) {
-                localStorage.setItem('sessionId', sessionId);
-            } else {
-                localStorage.removeItem('sessionId');
-            }
+        if (sessionId) {
+            jitsiLocalStorage.setItem('sessionId', sessionId);
+        } else {
+            jitsiLocalStorage.removeItem('sessionId');
         }
     }
 };
@@ -110,25 +92,6 @@ function generateJitsiMeetId() {
     return jitsiMeetId;
 }
 
-/**
- * Gets the localStorage of the browser. (Technically, gets the localStorage of
- * the global object because there may be no browser but React Native for
- * example).
- * @returns {Storage} the local Storage object (if any)
- */
-function getLocalStorage() {
-    let storage;
-
-    try {
-        // eslint-disable-next-line no-invalid-this
-        storage = (window || this).localStorage;
-    } catch (error) {
-        logger.error(error);
-    }
-
-    return storage;
-}
-
 /**
  *
  */

package-lock.json

@@ -5267,8 +5267,8 @@
       "dev": true
     },
     "js-utils": {
-      "version": "github:jitsi/js-utils#df68966e3c65b5c57fcd2670da1326a2c77518d1",
-      "from": "github:jitsi/js-utils#df68966e3c65b5c57fcd2670da1326a2c77518d1",
+      "version": "github:jitsi/js-utils#0c0c4142bd559fffffaebaded80bdaba8414d6b8",
+      "from": "github:jitsi/js-utils#0c0c4142bd559fffffaebaded80bdaba8414d6b8",
       "requires": {
         "bowser": "2.7.0",
         "js-md5": "0.7.3",

package.json

@@ -21,7 +21,7 @@
     "async": "0.9.0",
     "current-executing-script": "0.1.3",
     "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
-    "js-utils": "github:jitsi/js-utils#df68966e3c65b5c57fcd2670da1326a2c77518d1",
+    "js-utils": "github:jitsi/js-utils#0c0c4142bd559fffffaebaded80bdaba8414d6b8",
     "lodash.isequal": "4.5.0",
     "sdp-transform": "2.3.0",
     "strophe.js": "1.3.4",