anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

trying to fix the connection status

Browse source
This commit is contained in:
Manuel Araoz 2014-08-18 18:19:54 -04:00
commit 4d59d7cfd5
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/models/core/Wallet.js
View file

@ -319,6 +319,9 @@ Wallet.prototype._handleAddressBook = function(senderId, data, isInbound) {
};
Wallet.prototype._handleData = function(senderId, data, isInbound) {
preconditions.checkArgument(senderId);
preconditions.checkArgument(data);
preconditions.checkArgument(data.type);
if (data.type !== 'walletId' && this.id !== data.walletId) {
this.emit('badMessage', senderId);
@ -453,6 +456,7 @@ Wallet.prototype.netStart = function(callback) {
net.start(startOpts, function() {
self.emit('ready', net.getPeer());
self.fakeConnections();
setTimeout(function() {
self.emit('publicKeyRingUpdated', true);
//self.scheduleConnect();
@ -463,6 +467,17 @@ Wallet.prototype.netStart = function(callback) {
};
// TODO temporary method. should remove this when we refactor peerID out
Wallet.prototype.fakeConnections = function() {
var all = this.publicKeyRing.getAllCopayerIds();
for (var i = 0; i < all.length; i++) {
var copayerID = all[i];
var peerID = this.network.peerFromCopayer(copayerID);
this.network._addCopayerMap(peerID, copayerID);
}
};
// not being used now
Wallet.prototype.scheduleConnect = function() {
var self = this;
@ -713,7 +728,7 @@ Wallet.prototype.getTxProposals = function() {
txp.finallyRejected = true;
}
if (txp.readonly && !txp.finallyRejected && !txp.sentTs) {} else {
if (!txp.readonly || txp.finallyRejected || txp.sentTs) {
ret.push(txp);
}
}