mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Remove test/protos symlink, use window.PROTO_ROOT for config

Browse source
This commit is contained in:
Scott Nonnenberg 2017-05-17 18:01:33 -07:00
parent f4aa6d93a7
commit 3a3aa3efb6
No known key found for this signature in database
GPG key ID: A4931C09644C654B
6 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/libtextsecure.js
View file

@ -37095,11 +37095,18 @@ Internal.SessionLock.queueJobForNumber = function queueJobForNumber(number, runJ
window.textsecure.protobuf = {};
function loadProtoBufs(filename) {
return dcodeIO.ProtoBuf.loadProtoFile({root: 'protos', file: filename}, function(error, result) {
var protos = result.build('textsecure');
for (var protoName in protos) {
textsecure.protobuf[protoName] = protos[protoName];
}
return dcodeIO.ProtoBuf.loadProtoFile({root: window.PROTO_ROOT, file: filename}, function(error, result) {
if (error) {
throw error;
}
var protos = result.build('textsecure');
if (!protos) {
var text = 'Error loading protos from ' + filename + ' (root: ' + window.PROTO_ROOT + ')';
throw new Error(text);
}
for (var protoName in protos) {
textsecure.protobuf[protoName] = protos[protoName];
}
});
};