Chrome App fixes

js/app.js

@@ -3,7 +3,7 @@
 var copay = require('copay');
 var _ = require('lodash');
 var config = defaultConfig;
-var LS = require('../plugins/LocalStorage');
+var LS = require('../js/plugins/LocalStorage');
 var ls = new LS();
 
 var localConfig;

js/controllers/head.js

@@ -4,8 +4,6 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
   $scope.username = $rootScope.iden.getName();
   $scope.hoverMenu = false;
 
-  console.log('$scope.username', $scope.username);
-
   $scope.hoverIn = function() {
     this.hoverMenu = true;
   };

js/controllers/unsupported.js

@@ -5,10 +5,8 @@ angular.module('copayApp.controllers').controller('UnsupportedController',
 
     var localStorage;
     if (window.chrome && chrome.runtime && chrome.runtime.id) {
-      console.log('Is a chrome app!..unssoported.js');
       localStorage = chrome.storage.local;
     } else {
-      console.log('Is web!');
       localStorage = window.localStorage;
     }
     if (localStorage && localStorage.length > 0) {

js/plugins/LocalStorage.js

@@ -1,26 +1,32 @@
 'use strict';
 var _ = require('lodash');
 var preconditions = require('preconditions').singleton();
-var isChromeApp = window.chrome && chrome.runtime && chrome.runtime.id;
+var isChromeApp = typeof window !== "undefined" && window.chrome && chrome.runtime && chrome.runtime.id;
 
 
-function LocalStorage() {
+function LocalStorage(opts) {
   this.type = 'DB';
+  opts = opts || {};
 
-  if (isChromeApp) {
+
-    localStorage = chrome.storage.local;
+
+
+  this.ls = opts.ls ||
+    ((typeof localStorage !== "undefined") ? localStorage : null);
+
+  if (isChromeApp && !this.ls) {
+    this.ls = localStorage = chrome.storage.local;
     window.localStorage = chrome.storage.local;
   }
 
-  preconditions.checkState(typeof localStorage !== 'undefined',
+  preconditions.checkState(this.ls,
     'localstorage not available, cannot run plugin');
 };
 
 LocalStorage.prototype.init = function() {};
 
 LocalStorage.prototype.setCredentials = function(email, password, opts) {
-  this.email = email;
+  // NOP
-  this.password = password;
 };
 
 LocalStorage.prototype.getItem = function(k, cb) {
@@ -31,7 +37,7 @@ LocalStorage.prototype.getItem = function(k, cb) {
         return cb(null, data[k]);
       });
   } else {
-    return cb(null, localStorage.getItem(k));
+    return cb(null, this.ls.getItem(k));
   }
 };
 
@@ -40,15 +46,11 @@ LocalStorage.prototype.getItem = function(k, cb) {
  */
 LocalStorage.prototype.createItem = function(name, value, callback) {
   var self = this;
-  console.log('createItem ');
   self.getItem(name,
     function(err, data) {
-      console.log('error ', err);
-      console.log('data ', data);
       if (data) {
         return callback('EEXISTS');
       } else {
-        console.log('calling setitem ');
         return self.setItem(name, value, callback);
       }
     });
@@ -58,9 +60,10 @@ LocalStorage.prototype.setItem = function(k, v, cb) {
   if (isChromeApp) {
     var obj = {};
     obj[k] = v;
+
     chrome.storage.local.set(obj, cb);
   } else {
-    localStorage.setItem(k, v);
+    this.ls.setItem(k, v);
     return cb();
   }
 
@@ -70,7 +73,7 @@ LocalStorage.prototype.removeItem = function(k, cb) {
   if (isChromeApp) {
     chrome.storage.remove(k, cb);
   } else {
-    localStorage.removeItem(k);
+    this.ls.removeItem(k);
     return cb();
   }
 
@@ -80,50 +83,27 @@ LocalStorage.prototype.clear = function(cb) {
   if (isChromeApp) {
     chrome.storage.clear();
   } else {
-    localStorage.clear();
+    this.ls.clear();
   }
   return cb();
 };
 
 LocalStorage.prototype.allKeys = function(cb) {
-
   if (isChromeApp) {
     chrome.storage.local.get(null, function(items) {
       return cb(null, _.keys(items));
     });
   } else {
     var ret = [];
-    var l = localStorage.length;
+    var l = this.ls.length;
 
     for (var i = 0; i < l; i++)
-      ret.push(localStorage.key(i));
+      ret.push(this.ls.key(i));
 
     return cb(null, ret);
   }
 };
 
-LocalStorage.prototype.getFirst = function(prefix, opts, cb) {
-  opts = opts || {};
-  var that = this;
 
-  this.allKeys(function(err, allKeys) {
-    var keys = _.filter(allKeys, function(k) {
-      if ((k === prefix) || k.indexOf(prefix) === 0) return true;
-    });
-
-    if (keys.length === 0)
-      return cb(new Error('not found'));
-
-    if (opts.onlyKey)
-      return cb(null, null, keys[0]);
-
-    that.getItem(keys[0], function(err, data) {
-      if (err) {
-        return cb(err);
-      }
-      return cb(null, data, keys[0]);
-    });
-  });
-};
 
 module.exports = LocalStorage;

js/routes.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var LS = require('../plugins/LocalStorage');
+var LS = require('../js/plugins/LocalStorage');
 var ls = new LS();
 
 //Setting up route

js/services/applicationService.js

@@ -11,8 +11,7 @@ angular.module('copayApp.services')
       // Go home reloading the application
       var hashIndex = window.location.href.indexOf('#!/');
       if (isChromeApp) {
-        console.log('isChromeApp  restting ');
+        chrome.runtime.reload();
-        chrome.runtime.restart();
       } else {
         window.location = window.location.href.substr(0, hashIndex);
       }

js/services/notifications.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var LS = require('../plugins/LocalStorage');
+var LS = require('../js/plugins/LocalStorage');
 var ls = new LS();
 
 angular.module('copayApp.services').