Fix Conflicts:

index.html

js/app.js

@@ -59,4 +59,3 @@ angular.module('copay.video', []);
 angular.module('copay.import', []);
 angular.module('copay.passphrase', []);
 angular.module('copay.settings', []);
-

js/controllers/import.js

@@ -6,7 +6,15 @@ angular.module('copay.import').controller('ImportController',
     var reader = new FileReader();
     var _importBackup = function(encryptedObj) {
       Passphrase.getBase64Async($scope.password, function(passphrase){
-        $rootScope.wallet = walletFactory.fromEncryptedObj(encryptedObj, passphrase);
+        var w = walletFactory.fromEncryptedObj(encryptedObj, passphrase);
+        if (!w) {
+          $scope.loading = false;
+          $rootScope.$flashMessage = { message: 'Wrong password', type: 'error'};
+          $rootScope.$digest();
+          return;
+        }
+        $rootScope.wallet = w;
+
         controllerUtils.startNetwork($rootScope.wallet);
       });
     };
@@ -33,6 +41,7 @@ angular.module('copay.import').controller('ImportController',
       var password = form.password.$modelValue;
 
       if (!backupFile && !backupText) {
+        $scope.loading = false;
         $rootScope.$flashMessage = { message: 'Please, select your backup file or paste the text', type: 'error'};
         $scope.loading = false;
         return;

js/controllers/signin.js

@@ -23,17 +23,15 @@ angular.module('copay.signin').controller('SigninController',
 
       console.log('## Obtaining passphrase...'); 
       Passphrase.getBase64Async(password, function(passphrase){
-        console.log('## Done.');
+        console.log('## Passphrase obtained');
         var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase});
         if (!w) {
           $scope.loading = $scope.failure = false;
-          $rootScope.$flashMessage = { message: 'Bad password or connection error', type: 'error'};
+          $rootScope.$flashMessage = { message: 'Wrong password', type: 'error'};
           $rootScope.$digest();
           return;
         }
-        console.log('[signin.js.49]'); //TODO
         installStartupHandlers(w);
-        console.log('[signin.js.52]'); //TODO
         controllerUtils.startNetwork(w);
       });
     };

js/models/core/Wallet.js

@@ -63,9 +63,7 @@ Wallet.prototype.seedCopayer = function(pubKey) {
 
 Wallet.prototype.connectToAll = function() {
 
-console.log('[Wallet.js.57]'); //TODO
   var all = this.publicKeyRing.getAllCopayerIds();
-
 console.log('[Wallet.js.58] connecting'); //TODO
   this.network.connectToCopayers(all);
   if (this.seededCopayerId) {
@@ -224,8 +222,8 @@ Wallet.prototype.netStart = function() {
     self.log('[Wallet.js.132:openError:] GOT  openError'); //TODO
     self.emit('openError');
   });
-  net.on('error', function(){
-    self.emit('connectionError'); // Bubble the error
+  net.on('error', function() {
+    self.emit('connectionError');
   });
   net.on('close', function() {
     self.emit('close');

js/models/core/WalletFactory.js

@@ -39,14 +39,11 @@ WalletFactory.prototype.log = function(){
 WalletFactory.prototype._checkRead = function(walletId) {
   var s = this.storage;
   var ret = 
-    (
       s.get(walletId, 'publicKeyRing') &&
       s.get(walletId, 'txProposals')   &&
       s.get(walletId, 'opts') &&
-      s.get(walletId, 'privateKey')
-    )?true:false;
-  ;
-  return ret?true:false;
+      s.get(walletId, 'privateKey');
+  return !!ret;
 };
 
 WalletFactory.prototype.fromObj = function(obj) {
@@ -60,8 +57,9 @@ WalletFactory.prototype.fromObj = function(obj) {
 WalletFactory.prototype.fromEncryptedObj = function(base64, password) {
   this.storage._setPassphrase(password);
   var walletObj = this.storage.import(base64);
-  var w= this.fromObj(walletObj);
-  w.store();
+  if (!walletObj) return false;
+  var w = this.fromObj(walletObj);
+  if (!w) return false;
   return w;
 };
 
@@ -149,7 +147,6 @@ WalletFactory.prototype.open = function(walletId, opts) {
 
   var w = this.read(walletId);
 
- 
   if (w) {
     this._checkVersion(w.version);
     w.store();

js/models/network/WebRTC.js

@@ -269,7 +269,6 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
     self._checkAnyPeer();
   });
 
-
   p.on('connection', function(dataConn) {
     console.log('### NEW INBOUND CONNECTION %d/%d', self.connectedPeers.length, self.maxPeers);
     if (self.connectedPeers.length >= self.maxPeers) {

js/models/storage/LocalEncrypted.js

@@ -3,6 +3,7 @@
 var imports = require('soop').imports();
 
 var id = 0;
+
 function Storage(opts) {
   opts = opts || {};
 
@@ -33,12 +34,16 @@ Storage.prototype._encryptObj = function(obj) {
 };
 
 Storage.prototype._decrypt = function(base64) {
-  var decryptedStr=null;
-  var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
-
-  if (decrypted)
-    decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
+  var decryptedStr = null;
+  try {
+    var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
 
+    if (decrypted)
+      decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
+  } catch (e) {
+    console.log('Error while decrypting ' + base64);
+    return null;
+  }
   return decryptedStr;
 };
 
@@ -49,22 +54,16 @@ Storage.prototype._decryptObj = function(base64) {
 
 Storage.prototype._read = function(k) {
   var ret;
-  try {
-    ret = localStorage.getItem(k);
-    if (ret){
-      ret = this._decrypt(ret);
-      ret = ret.toString(CryptoJS.enc.Utf8);
-      ret = JSON.parse(ret);
-    }
-  } catch (e) {
-    console.log('Error while decrypting: '+e);
-    return null;
-  };
-
+  ret = localStorage.getItem(k);
+  if (!ret) return null;
+  ret = this._decrypt(ret);
+  if (!ret) return null;
+  ret = ret.toString(CryptoJS.enc.Utf8);
+  ret = JSON.parse(ret);
   return ret;
 };
 
-Storage.prototype._write = function(k,v) {
+Storage.prototype._write = function(k, v) {
   v = JSON.stringify(v);
   v = this._encrypt(v);
 
@@ -78,7 +77,7 @@ Storage.prototype.getGlobal = function(k) {
 };
 
 // set value for key
-Storage.prototype.setGlobal = function(k,v) {
+Storage.prototype.setGlobal = function(k, v) {
   localStorage.setItem(k, JSON.stringify(v));
 };
 
@@ -92,46 +91,45 @@ Storage.prototype._key = function(walletId, k) {
 };
 // get value by key
 Storage.prototype.get = function(walletId, k) {
-  var ret = this._read(this._key(walletId,k));
-
+  var ret = this._read(this._key(walletId, k));
   return ret;
 };
 
 // set value for key
-Storage.prototype.set = function(walletId, k,v) {
-  this._write(this._key(walletId,k), v);
+Storage.prototype.set = function(walletId, k, v) {
+  this._write(this._key(walletId, k), v);
 };
 
 // remove value for key
 Storage.prototype.remove = function(walletId, k) {
-  this.removeGlobal(this._key(walletId,k));
+  this.removeGlobal(this._key(walletId, k));
 };
 
 Storage.prototype.setName = function(walletId, name) {
-  this.setGlobal('nameFor::'+walletId, name);
+  this.setGlobal('nameFor::' + walletId, name);
 };
 
 Storage.prototype.getName = function(walletId) {
-  return this.getGlobal('nameFor::'+walletId);
+  return this.getGlobal('nameFor::' + walletId);
 };
 
 Storage.prototype.getWalletIds = function() {
   var walletIds = [];
   var uniq = {};
   for (var i = 0; i < localStorage.length; i++) {
-     var key = localStorage.key(i);
-     var split = key.split('::');
-     if (split.length == 2) {
+    var key = localStorage.key(i);
+    var split = key.split('::');
+    if (split.length == 2) {
       var walletId = split[0];
 
       if (walletId === 'nameFor') continue;
 
-      if (typeof uniq[walletId] === 'undefined' ) {
+      if (typeof uniq[walletId] === 'undefined') {
         walletIds.push(walletId);
         uniq[walletId] = 1;
       }
-     }
-   } 
+    }
+  }
   return walletIds;
 };
 
@@ -140,9 +138,9 @@ Storage.prototype.getWallets = function() {
   var uniq = {};
   var ids = this.getWalletIds();
 
-  for (var i in ids){
+  for (var i in ids) {
     wallets.push({
-      id:ids[i],
+      id: ids[i],
       name: this.getName(ids[i]),
     });
   }

js/services/controllerUtils.js

@@ -62,35 +62,29 @@ angular.module('copay.controllerUtils')
         $rootScope.wallet = w;
         $location.path('addresses');
         video.setOwnPeer(myPeerID, w, handlePeerVideo);
-        console.log('# Done ready handler'); 
       });
 
       w.on('publicKeyRingUpdated', function(dontDigest) {
-        console.log('[start publicKeyRing handler]'); //TODO
         root.setSocketHandlers();
         root.updateAddressList();
         if (!dontDigest) {
-          console.log('[pkr digest]');
           $rootScope.$digest();
-          console.log('[done digest]');
         }
       });
       w.on('txProposalsUpdated', function(dontDigest) {
         root.updateTxs({onlyPending:true});
         root.updateBalance(function(){
           if (!dontDigest) {
-            console.log('[txp digest]');
             $rootScope.$digest();
-            console.log('[done digest]');
           }
         });
       });
       w.on('openError', root.onErrorDigest);
+      w.on('connectionError', root.onErrorDigest);
       w.on('connect', function(peerID) {
         if (peerID) {
           video.callPeer(peerID, handlePeerVideo);
         }
-        console.log('[digest]');
         $rootScope.$digest();
       });
       w.on('disconnect', function(peerID) {
@@ -129,7 +123,6 @@ angular.module('copay.controllerUtils')
         $rootScope.availableBalance = safeBalance;
         root.updateAddressList();
         $rootScope.updatingBalance = false;
-        console.log('Done updating balance.'); //TODO
         return cb?cb():null;
       });
     };
@@ -145,7 +138,6 @@ angular.module('copay.controllerUtils')
       var inT = w.getTxProposals().sort(function(t1, t2) { return t1.createdTs < t2.createdTs });
       var txs  = [];
 
-      console.log('[START LOOP]'); //TODO
       inT.forEach(function(i, index){
         if (opts.skip && (index < opts.skip[0] || index >= opts.skip[1])) {
           return txs.push(null);

js/shell.js

@@ -0,0 +1,60 @@
+/*
+** copay-shell integration
+*/
+(function() {
+  /*
+  ** This is a monkey patch for when Copay is running from
+  ** within Copay-Shell (atom-shell). Since the renderer (the frontend)
+  ** receives context from Node.js, we get a `module.exports` contruct
+  ** available to us. Because of this, some libs (specifically Moment.js)
+  ** attempt to assume their CommonJS form and bind to this. This causes
+  ** there to be no references in the window to these libs, so let's trick
+  ** the renderer into thinking that we are _not_ in a CommonJS environment.
+  */
+  if (typeof module !== 'undefined') module = { exports: null };
+
+  // are we running in copay shell?
+  if (process && process.type === 'renderer') initCopayShellBindings();
+
+  function controller(name) {
+    return angular.element(
+      document.querySelectorAll(
+        '[ng-controller="' + name + '"], [data-ng-controller="' + name + '"]'
+      )
+    ).scope();
+  };
+
+  function initCopayShellBindings() {
+
+    var ipc = require('ipc');
+
+    ipc.on('address:create', function(data) {
+      location.href = '#/addresses';
+      controller('AddressesController').newAddr();
+    });
+
+    ipc.on('transactions:send', function(data) {
+      location.href = '#/send';
+    });
+
+    ipc.on('transactions:all', function(data) {
+      location.href = '#/transactions';
+      controller('TransactionsController').show();
+    });
+
+    ipc.on('transactions:pending', function(data) {
+      location.href = '#/transactions';
+      controller('TransactionsController').show(true);
+    });
+
+    ipc.on('backup:download', function(data) {
+
+    });
+
+    ipc.on('backup:email', function(data) {
+
+    });
+
+  };
+
+})();