working!

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'));