thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update libsignal-protocol 1.1.7

Browse source
This commit is contained in:
lilia 2016-10-05 22:01:52 +09:00
parent 7c81e4ed2e
commit 73e69fe5eb
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
js/libtextsecure.js
View file

@ -35665,7 +35665,12 @@ Internal.SessionRecord = function() {
} else if (thing === Object(thing)) { } else if (thing === Object(thing)) {
var obj = {}; var obj = {};
for (var key in thing) { for (var key in thing) {
obj[key] = ensureStringed(thing[key]); try {
obj[key] = ensureStringed(thing[key]);
} catch (ex) {
console.log('Error serializing key', key);
throw ex;
}
} }
return obj; return obj;
} else if (thing === null) { } else if (thing === null) {
@ -35684,12 +35689,21 @@ Internal.SessionRecord = function() {
version: 'v1', version: 'v1',
migrate: function migrateV1(data) { migrate: function migrateV1(data) {
var sessions = data.sessions; var sessions = data.sessions;
var key;
if (data.registrationId) { if (data.registrationId) {
for (var key in sessions) { for (key in sessions) {
if (!sessions[key].registrationId) { if (!sessions[key].registrationId) {
sessions[key].registrationId = data.registrationId; sessions[key].registrationId = data.registrationId;
} }
} }
} else {
for (key in sessions) {
if (sessions[key].indexInfo.closed === -1) {
console.log('V1 session storage migration error: registrationId',
data.registrationId, 'for open session version',
data.version);
}
}
} }
} }
} }
@ -35734,7 +35748,8 @@ Internal.SessionRecord = function() {
}); });
}, },
haveOpenSession: function() { haveOpenSession: function() {
return this.getOpenSession() !== undefined; var openSession = this.getOpenSession();
return (!!openSession && !!openSession.registrationId);
}, },
getSessionByBaseKey: function(baseKey) { getSessionByBaseKey: function(baseKey) {

21
libtextsecure/libsignal-protocol.js
View file

@ -35541,7 +35541,12 @@ Internal.SessionRecord = function() {
} else if (thing === Object(thing)) { } else if (thing === Object(thing)) {
var obj = {}; var obj = {};
for (var key in thing) { for (var key in thing) {
obj[key] = ensureStringed(thing[key]); try {
obj[key] = ensureStringed(thing[key]);
} catch (ex) {
console.log('Error serializing key', key);
throw ex;
}
} }
return obj; return obj;
} else if (thing === null) { } else if (thing === null) {
@ -35560,12 +35565,21 @@ Internal.SessionRecord = function() {
version: 'v1', version: 'v1',
migrate: function migrateV1(data) { migrate: function migrateV1(data) {
var sessions = data.sessions; var sessions = data.sessions;
var key;
if (data.registrationId) { if (data.registrationId) {
for (var key in sessions) { for (key in sessions) {
if (!sessions[key].registrationId) { if (!sessions[key].registrationId) {
sessions[key].registrationId = data.registrationId; sessions[key].registrationId = data.registrationId;
} }
} }
} else {
for (key in sessions) {
if (sessions[key].indexInfo.closed === -1) {
console.log('V1 session storage migration error: registrationId',
data.registrationId, 'for open session version',
data.version);
}
}
} }
} }
} }
@ -35610,7 +35624,8 @@ Internal.SessionRecord = function() {
}); });
}, },
haveOpenSession: function() { haveOpenSession: function() {
return this.getOpenSession() !== undefined; var openSession = this.getOpenSession();
return (!!openSession && !!openSession.registrationId);
}, },
getSessionByBaseKey: function(baseKey) { getSessionByBaseKey: function(baseKey) {