working!

js/controllers/create.js

@@ -86,8 +86,9 @@ angular.module('copayApp.controllers').controller('CreateController',
           privateKeyHex: $scope.private,
           networkName: $scope.networkName,
         };
-        var w = walletFactory.create(opts);
-        controllerUtils.startNetwork(w, $scope);
+        walletFactory.create(opts, function(err, w) {
+          controllerUtils.startNetwork(w, $scope);
+        });
       });
     };
 

js/controllers/open.js

@@ -16,19 +16,19 @@ angular.module('copayApp.controllers').controller('OpenController', function($sc
   $scope.loading = false;
   walletFactory.getWallets(function(wallets) {
     $scope.wallets = wallets.sort(cmp);
-  });
 
-  walletFactory.storage.getLastOpened(function(ret) {
-    $scope.selectedWalletId = ret || ($scope.wallets[0] && $scope.wallets[0].id);
+    if (!$scope.wallets.length) {
+      $location.path('/');
+    }
+
+    walletFactory.storage.getLastOpened(function(ret) {
+      $scope.selectedWalletId = ret || ($scope.wallets[0] && $scope.wallets[0].id);
+    });
   });
 
   $scope.openPassword = '';
   $scope.isMobile = !!window.cordova;
 
-  if (!$scope.wallets.length) {
-    $location.path('/');
-  }
-
   $scope.open = function(form) {
     if (form && form.$invalid) {
       notification.error('Error', 'Please enter the required fields');

js/models/Storage.js

@@ -83,6 +83,7 @@ Storage.prototype.getGlobal = function(k, cb) {
   preconditions.checkArgument(cb);
 
   this.storage.getItem(k, function(item) {
+console.log('[Storage.js.96:item:]',item); //TODO
     cb(item == 'undefined' ? undefined : item);
   });
 };
@@ -118,18 +119,34 @@ Storage.prototype.get = function(walletId, k, cb) {
   this._read(this._key(walletId, k), cb);
 };
 
+
+Storage.prototype._readHelper = function(walletId, k, cb) {
+console.log('[Storage.js.134:walletId:]',walletId,k); //TODO
+  var wk = this._key(walletId, k);
+
+  this._read(wk, function(v){
+    return cb(v,k);
+  });
+};
+
 Storage.prototype.getMany = function(walletId, keys, cb) {
   preconditions.checkArgument(cb);
 
   var self = this;
   var ret = {};
+console.log('[Storage.js.142:keys:]',keys); //TODO
+
+  var l = keys.length, i=0;
 
-  var l = keys.length - 1;
   for (var ii in keys) {
-    var k = keys[ii];
-    this._read(this._key(walletId, k), function(v) {
+    this._readHelper(walletId, keys[ii], function(v, k) {
       ret[k] = v;
-      if (ii == l) return cb(ret);
+console.log('[Storage.js.144:ret:]',k,i,l,v); //TODO
+      if (++i == l) {
+
+console.log('[Storage.js.157] LKIST', ret); //TODO
+       return cb(ret);
+      }
     });
   }
 };
@@ -148,9 +165,8 @@ Storage.prototype.setName = function(walletId, name, cb) {
   this.setGlobal('nameFor::' + walletId, name, cb);
 };
 
-Storage.prototype.getName = function(walletId) {
-  var ret = this.getGlobal('nameFor::' + walletId);
-  return ret;
+Storage.prototype.getName = function(walletId, cb) {
+  this.getGlobal('nameFor::' + walletId, cb);
 };
 
 Storage.prototype.getWalletIds = function(cb) {
@@ -185,17 +201,21 @@ Storage.prototype.getWallets = function(cb) {
   var self = this;
 
   this.getWalletIds(function(ids) {
-    var l = ids.length - 1;
+console.log('[Storage.js.197:ids:]',ids); //TODO
+    var l = ids.length, i=0;
     if (!l)
       return cb([]);
 
-    for (var i in ids) {
-      self.getName(ids[i], function(name) {
+    for (var ii in ids) {
+      var id = ids[ii];
+console.log('[Storage.js.206:id:]',id); //TODO
+      self.getName(id, function(name) {
         wallets.push({
-          id: ids[i],
+          id: id,
           name: name,
         });
-        if (i == l) {
+console.log('[Storage.js.208:wallets:]',wallets); //TODO
+        if (++i == l) {
           return cb(wallets);
         }
       })
@@ -232,7 +252,6 @@ Storage.prototype.setFromObj = function(walletId, obj, cb) {
   preconditions.checkArgument(cb);
   var self = this;
 
-  console.log('[Storage.js.241]'); //TODO
   var l = Object.keys(obj).length,
     i = 0;
   for (var k in obj) {

js/models/core/WalletFactory.js

@@ -178,10 +178,10 @@ WalletFactory.prototype.read = function(walletId, skipFields, cb) {
  * @TODO: Figure out in what unit is this reconnect delay.
  * @param {number} opts.reconnectDelay milliseconds?
  * @param {number=} opts.version
+ * @param {callback} opts.version
  * @return {Wallet}
  */
-WalletFactory.prototype.create = function(opts) {
-
+WalletFactory.prototype.create = function(opts, cb) {
   opts = opts || {};
   opts.networkName = opts.networkName || 'testnet';
 
@@ -230,9 +230,12 @@ WalletFactory.prototype.create = function(opts) {
   opts.version = opts.version || this.version;
 
   var w = new Wallet(opts);
-  w.store();
-  this.storage.setLastOpened(w.id);
-  return w;
+  var self = this;
+  w.store(function() {
+    self.storage.setLastOpened(w.id, function() {
+      return cb(null, w);
+    });
+  });
 };
 
 /**
@@ -364,15 +367,13 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
     connectedOnce = true;
   });
 
-  << << << < HEAD
-  joinNetwork.on('serverError', function() { === === =
-        self.network.on('serverError', function() { >>> >>> > wallet listing working
-          return cb('joinError');
-        });
+  joinNetwork.on('serverError', function() {
+    return cb('joinError');
+  });
 
-      joinNetwork.start(opts, function() {
-        joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
-        joinNetwork.on('data', function(sender, data) {
+  joinNetwork.start(opts, function() {
+      joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
+      joinNetwork.on('data', function(sender, data) {
           if (data.type === 'walletId') {
             if (data.networkName !== decodedSecret.networkName) {
               return cb('badNetwork');
@@ -382,14 +383,18 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
             data.opts.nickname = nickname;
             data.opts.passphrase = passphrase;
             data.opts.id = data.walletId;
-            var w = self.create(data.opts);
-            w.sendWalletReady(decodedSecret.pubKey);
-            return cb(null, w);
-          } else {
-            return cb('walletFull', w);
-          }
-        });
-      });
-    };
+            self.create(data.opts, function(err, w) {
+              if (!err & w) {
+                w.sendWalletReady(s.pubKey);
+              } else {
+                if (!err) err = 'walletFull';
+              }
+              return cb(err, w);
+            });
 
-    module.exports = WalletFactory;
+          });
+      });
+  };
+};
+
+module.exports = WalletFactory;

js/models/core/WalletLock.js

@@ -10,7 +10,7 @@ function WalletLock(storage, walletId, timeoutMin) {
   this.storage = storage;
   this.timeoutMin = timeoutMin || 5;
   this.key = WalletLock._keyFor(walletId);
-  this._setLock(function() {});
+  //  this._setLock(function() {});
 }
 
 WalletLock._keyFor = function(walletId) {
@@ -18,7 +18,9 @@ WalletLock._keyFor = function(walletId) {
 };
 
 WalletLock.prototype._isLockedByOther = function(cb) {
-  var self=this;
+  var self = this;
+
+  console.log('[WalletLock.js.22]'); //TODO
   this.storage.getGlobal(this.key, function(json) {
     var wl = json ? JSON.parse(json) : null;
     var t = wl ? (Date.now() - wl.expireTs) : false;
@@ -33,10 +35,13 @@ WalletLock.prototype._isLockedByOther = function(cb) {
 
 
 WalletLock.prototype._setLock = function(cb) {
+
   this.storage.setGlobal(this.key, {
     sessionId: this.sessionId,
     expireTs: Date.now() + this.timeoutMin * 60 * 1000,
-  }, cb);
+  }, function() {
+    cb(null);
+  });
 };
 
 
@@ -45,6 +50,7 @@ WalletLock.prototype.keepAlive = function(cb) {
   var self = this;
 
   this._isLockedByOther(function(t) {
+
     if (t)
       return cb(new Error('Wallet is already open. Close it to proceed or wait ' + t + ' seconds if you close it already'));
 

js/routes.js

@@ -76,8 +76,8 @@ angular
   // IDLE timeout
   var timeout = config.wallet.idleDurationMin * 60 || 300;
   $idleProvider.idleDuration(timeout); // in seconds
-  $idleProvider.warningDuration(20); // in seconds
-  $keepaliveProvider.interval(2); // in seconds
+  $idleProvider.warningDuration(40); // in seconds
+  $keepaliveProvider.interval(30); // in seconds
 })
 .run(function($rootScope, $location, $idle, gettextCatalog) {
   gettextCatalog.currentLanguage = config.defaultLanguage;