From 22160f50d355c8151399eb53b8d4788e3eb8d81a Mon Sep 17 00:00:00 2001
From: Shriram Balaji <shrirambalaji1996@gmail.com>
Date: Tue, 7 Apr 2020 15:39:37 +0530
Subject: [PATCH] Wrap localStorage API Access in try-catch (#1241)

---
 src/components/TopErrorBoundary.tsx |  8 +++++--
 src/data/localStorage.ts            | 33 ++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/TopErrorBoundary.tsx b/src/components/TopErrorBoundary.tsx
index a0741036..bd386b4b 100644
--- a/src/components/TopErrorBoundary.tsx
+++ b/src/components/TopErrorBoundary.tsx
@@ -81,8 +81,12 @@ export class TopErrorBoundary extends React.Component<
             {t("errorSplash.clearCanvasMessage")}
             <button
               onClick={() => {
-                localStorage.clear();
-                window.location.reload();
+                try {
+                  localStorage.clear();
+                  window.location.reload();
+                } catch (error) {
+                  console.error(error);
+                }
               }}
             >
               {t("errorSplash.clearCanvasMessage_button")}
diff --git a/src/data/localStorage.ts b/src/data/localStorage.ts
index 25ea246e..2c283a99 100644
--- a/src/data/localStorage.ts
+++ b/src/data/localStorage.ts
@@ -10,19 +10,32 @@ export function saveToLocalStorage(
   elements: readonly ExcalidrawElement[],
   appState: AppState,
 ) {
-  localStorage.setItem(
-    LOCAL_STORAGE_KEY,
-    JSON.stringify(elements.filter((element) => !element.isDeleted)),
-  );
-  localStorage.setItem(
-    LOCAL_STORAGE_KEY_STATE,
-    JSON.stringify(clearAppStateForLocalStorage(appState)),
-  );
+  try {
+    localStorage.setItem(
+      LOCAL_STORAGE_KEY,
+      JSON.stringify(elements.filter((element) => !element.isDeleted)),
+    );
+    localStorage.setItem(
+      LOCAL_STORAGE_KEY_STATE,
+      JSON.stringify(clearAppStateForLocalStorage(appState)),
+    );
+  } catch (error) {
+    // Unable to access window.localStorage
+    console.error(error);
+  }
 }
 
 export function restoreFromLocalStorage() {
-  const savedElements = localStorage.getItem(LOCAL_STORAGE_KEY);
-  const savedState = localStorage.getItem(LOCAL_STORAGE_KEY_STATE);
+  let savedElements = null;
+  let savedState = null;
+
+  try {
+    savedElements = localStorage.getItem(LOCAL_STORAGE_KEY);
+    savedState = localStorage.getItem(LOCAL_STORAGE_KEY_STATE);
+  } catch (error) {
+    // Unable to access localStorage
+    console.error(error);
+  }
 
   let elements = [];
   if (savedElements) {