From bbedad0fc58e13d3b6633c062c14fd41c6fecfc4 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Sun, 15 Jan 2017 18:10:10 -0600
Subject: [PATCH] json parse exception handling

---
 app/assets/javascripts/app/app.frontend.js             | 4 +---
 app/assets/javascripts/app/frontend/models/api/item.js | 7 ++++++-
 app/assets/javascripts/app/services/apiController.js   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/app.frontend.js b/app/assets/javascripts/app/app.frontend.js
index bd2995417..f19dfe4fd 100644
--- a/app/assets/javascripts/app/app.frontend.js
+++ b/app/assets/javascripts/app/app.frontend.js
@@ -7,12 +7,10 @@ var Neeto = Neeto || {};
 var IEOrEdge = document.documentMode || /Edge/.test(navigator.userAgent);
 
 if(!IEOrEdge && (window.crypto && window.crypto.subtle)) {
-  console.log("Using webcrypto");
   Neeto.crypto = new SNCryptoWeb();
 } else {
-  console.log("Using CryptoJS");
+  Neeto.crypto = new SNCryptoJS();
 }
-Neeto.crypto = new SNCryptoJS();
 
 angular.module('app.frontend', [
   'ui.router',
diff --git a/app/assets/javascripts/app/frontend/models/api/item.js b/app/assets/javascripts/app/frontend/models/api/item.js
index e54468388..90c180943 100644
--- a/app/assets/javascripts/app/frontend/models/api/item.js
+++ b/app/assets/javascripts/app/frontend/models/api/item.js
@@ -27,7 +27,12 @@ class Item {
       return this.content;
     }
 
-    return JSON.parse(this.content);
+    try {
+      return JSON.parse(this.content);
+    } catch (e) {
+      console.log("Error parsing json", e);
+      return {};
+    }
   }
 
   updateFromJSON(json) {
diff --git a/app/assets/javascripts/app/services/apiController.js b/app/assets/javascripts/app/services/apiController.js
index 7a1843512..edd90c0db 100644
--- a/app/assets/javascripts/app/services/apiController.js
+++ b/app/assets/javascripts/app/services/apiController.js
@@ -566,7 +566,7 @@ angular.module('app.frontend')
                  item.content = Neeto.crypto.base64Decode(item.content.substring(3, item.content.length))
                }
              } catch (e) {
-               console.log("Error decrypting item", item);
+               console.log("Error decrypting item", item, e);
                continue;
              }
            }