keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Make end session consistent with android

Browse Source 
Close all the sessions for a number when receiving an end session
message.

// FREEBIE
pull/749/head
lilia 9 years ago
parent bf632bfa54
commit fe82e469f2
2 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File

44
js/libtextsecure.js
Unescape Escape View File

@ -36960,20 +36960,21 @@ MessageReceiver.prototype.extend({
handleDataMessage: function(envelope, message, close_session) {
var encodedNumber = envelope.source + '.' + envelope.sourceDevice;
console.log('data message from', encodedNumber, envelope.timestamp.toNumber());
var p = Promise.resolve();
if ((message.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION) ==
textsecure.protobuf.DataMessage.Flags.END_SESSION ) {
console.log('got end session');
console.log('closing session for device', encodedNumber);
close_session();
}
return this.processDecrypted(message, envelope.source).then(function(message) {
var ev = new Event('message');
ev.data = {
source : envelope.source,
timestamp : envelope.timestamp.toNumber(),
message : message
};
this.dispatchEvent(ev);
p = this.handleEndSession(envelope.source);
}
return p.then(function() {
return this.processDecrypted(message, envelope.source).then(function(message) {
var ev = new Event('message');
ev.data = {
source : envelope.source,
timestamp : envelope.timestamp.toNumber(),
message : message
};
this.dispatchEvent(ev);
}.bind(this));
}.bind(this));
},
handleLegacyMessage: function (envelope) {
@ -37098,17 +37099,28 @@ MessageReceiver.prototype.extend({
return textsecure.protocol_wrapper.handlePreKeyWhisperMessage(from, bytes).then(function(res) {
var finalMessage = textsecure.protobuf.DataMessage.decode(res[0]);
var p = Promise.resolve();
if ((finalMessage.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
== textsecure.protobuf.DataMessage.Flags.END_SESSION &&
finalMessage.sync !== null) {
console.log('got end session');
res[1]();
console.log('session closed for device', from);
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
p = this.handleEndSession(number);
}
return this.processDecrypted(finalMessage);
return p.then(function() {
return this.processDecrypted(finalMessage);
});
}.bind(this));
},
handleEndSession: function(number) {
console.log('got end session');
return textsecure.storage.devices.getDeviceObjectsForNumber(number).then(function(devices) {
return Promise.all(devices.map(function(device) {
console.log('closing session for', device.encodedNumber);
return textsecure.protocol_wrapper.closeOpenSessionForDevice(device.encodedNumber);
}));
});
},
processDecrypted: function(decrypted, source) {
// Now that its decrypted, validate the message and clean it up for consumer processing
// Note that messages may (generally) only perform one action and we ignore remaining fields

42
libtextsecure/message_receiver.js
Unescape Escape View File

@ -143,20 +143,21 @@ MessageReceiver.prototype.extend({
handleDataMessage: function(envelope, message, close_session) {
var encodedNumber = envelope.source + '.' + envelope.sourceDevice;
console.log('data message from', encodedNumber, envelope.timestamp.toNumber());
var p = Promise.resolve();
if ((message.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION) ==
textsecure.protobuf.DataMessage.Flags.END_SESSION ) {
console.log('got end session');
console.log('closing session for device', encodedNumber);
close_session();
p = this.handleEndSession(envelope.source);
}
return this.processDecrypted(message, envelope.source).then(function(message) {
var ev = new Event('message');
ev.data = {
source : envelope.source,
timestamp : envelope.timestamp.toNumber(),
message : message
};
this.dispatchEvent(ev);
return p.then(function() {
return this.processDecrypted(message, envelope.source).then(function(message) {
var ev = new Event('message');
ev.data = {
source : envelope.source,
timestamp : envelope.timestamp.toNumber(),
message : message
};
this.dispatchEvent(ev);
}.bind(this));
}.bind(this));
},
handleLegacyMessage: function (envelope) {
@ -281,17 +282,28 @@ MessageReceiver.prototype.extend({
return textsecure.protocol_wrapper.handlePreKeyWhisperMessage(from, bytes).then(function(res) {
var finalMessage = textsecure.protobuf.DataMessage.decode(res[0]);
var p = Promise.resolve();
if ((finalMessage.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
== textsecure.protobuf.DataMessage.Flags.END_SESSION &&
finalMessage.sync !== null) {
console.log('got end session');
res[1]();
console.log('session closed for device', from);
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
p = this.handleEndSession(number);
}
return this.processDecrypted(finalMessage);
return p.then(function() {
return this.processDecrypted(finalMessage);
});
}.bind(this));
},
handleEndSession: function(number) {
console.log('got end session');
return textsecure.storage.devices.getDeviceObjectsForNumber(number).then(function(devices) {
return Promise.all(devices.map(function(device) {
console.log('closing session for', device.encodedNumber);
return textsecure.protocol_wrapper.closeOpenSessionForDevice(device.encodedNumber);
}));
});
},
processDecrypted: function(decrypted, source) {
// Now that its decrypted, validate the message and clean it up for consumer processing
// Note that messages may (generally) only perform one action and we ignore remaining fields

Write Preview
Loading…
Cancel
Save