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

unified connect calls

Browse source
This commit is contained in:
Manuel Araoz 2014-05-09 15:02:57 -03:00
commit 0f1d651e36
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/models/network/WebRTC.js
View file

@ -147,6 +147,7 @@ Network.prototype._addConnectedCopayer = function(copayerId, isInbound) {
var peerId = this.peerFromCopayer(copayerId); var peerId = this.peerFromCopayer(copayerId);
this._addCopayerMap(peerId,copayerId); this._addCopayerMap(peerId,copayerId);
Network._arrayPushOnce(peerId, this.connectedPeers); Network._arrayPushOnce(peerId, this.connectedPeers);
this.emit('connect', copayerId);
}; };
Network.prototype._onData = function(encStr, isInbound, peerId) { Network.prototype._onData = function(encStr, isInbound, peerId) {
@ -177,7 +178,6 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
console.log('#### Peer sent hello. Setting it up.'); //TODO console.log('#### Peer sent hello. Setting it up.'); //TODO
this._addConnectedCopayer(payload.copayerId, isInbound); this._addConnectedCopayer(payload.copayerId, isInbound);
this._setInboundPeerAuth(peerId, true); this._setInboundPeerAuth(peerId, true);
this.emit('connect', payload.copayerId);
return; return;
} }
@ -223,9 +223,8 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
// The connecting peer send hello // The connecting peer send hello
if(toCopayerId) { if(toCopayerId) {
self._addConnectedCopayer(toCopayerId);
self._sendHello(toCopayerId); self._sendHello(toCopayerId);
self.emit('connect', toCopayerId); // TODO: try to unify both 'connect' emits self._addConnectedCopayer(toCopayerId);
} }
} }
}); });
@ -423,7 +422,7 @@ Network.prototype.lockIncommingConnections = function(allowedCopayerIdsArray) {
this.allowedCopayerIds={}; this.allowedCopayerIds={};
for(var i in allowedCopayerIdsArray) { for(var i in allowedCopayerIdsArray) {
this.allowedCopayerIds[ allowedCopayerIdsArray[i] ] = 1; this.allowedCopayerIds[ allowedCopayerIdsArray[i] ] = true;
} }
}; };

1
js/services/controllerUtils.js
View file

@ -91,6 +91,7 @@ angular.module('copay.controllerUtils')
}); });
w.on('openError', root.onErrorDigest); w.on('openError', root.onErrorDigest);
w.on('connect', function(peerID) { w.on('connect', function(peerID) {
//alert(w.getRegisteredPeerIds());
if (peerID) { if (peerID) {
video.callPeer(peerID, handlePeerVideo); video.callPeer(peerID, handlePeerVideo);
} }