Add logging to help track down problems with Sync

Seems like we're running into errors sending the message to kick off the
sync, so positive logging as well as error logging is included.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-08-17 12:20:40 -07:00
parent ef00c3828b
commit 4ef36cc95c
3 changed files with 32 additions and 2 deletions

View file

@ -39676,6 +39676,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}
return Promise.resolve();
},
sendRequestContactSyncMessage: function() {
@ -39691,6 +39693,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}
return Promise.resolve();
},
syncReadMessages: function(reads) {
var myNumber = textsecure.storage.user.getNumber();
@ -39709,6 +39713,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}
return Promise.resolve();
},
syncVerification: function(destination, state, identityKey) {
var myNumber = textsecure.storage.user.getNumber();
@ -39743,6 +39749,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}.bind(this));
}
return Promise.resolve();
},
sendGroupProto: function(numbers, proto, timestamp) {
@ -40017,8 +40025,15 @@ textsecure.MessageSender.prototype = {
this.ongroup = this.onGroupSyncComplete.bind(this);
receiver.addEventListener('groupsync', this.ongroup);
console.log('SyncRequest created. Sending contact sync message...');
sender.sendRequestContactSyncMessage().then(function() {
sender.sendRequestGroupSyncMessage();
console.log('SyncRequest now sending group sync messsage...');
return sender.sendRequestGroupSyncMessage();
}).catch(function(error) {
console.log(
'SyncRequest error:',
error && error.stack ? error.stack : error
);
});
this.timeout = setTimeout(this.onTimeout.bind(this), 60000);
}

View file

@ -333,6 +333,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}
return Promise.resolve();
},
sendRequestContactSyncMessage: function() {
@ -348,6 +350,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}
return Promise.resolve();
},
syncReadMessages: function(reads) {
var myNumber = textsecure.storage.user.getNumber();
@ -366,6 +370,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}
return Promise.resolve();
},
syncVerification: function(destination, state, identityKey) {
var myNumber = textsecure.storage.user.getNumber();
@ -400,6 +406,8 @@ MessageSender.prototype = {
return this.sendIndividualProto(myNumber, contentMessage, Date.now());
}.bind(this));
}
return Promise.resolve();
},
sendGroupProto: function(numbers, proto, timestamp) {

View file

@ -19,8 +19,15 @@
this.ongroup = this.onGroupSyncComplete.bind(this);
receiver.addEventListener('groupsync', this.ongroup);
console.log('SyncRequest created. Sending contact sync message...');
sender.sendRequestContactSyncMessage().then(function() {
sender.sendRequestGroupSyncMessage();
console.log('SyncRequest now sending group sync messsage...');
return sender.sendRequestGroupSyncMessage();
}).catch(function(error) {
console.log(
'SyncRequest error:',
error && error.stack ? error.stack : error
);
});
this.timeout = setTimeout(this.onTimeout.bind(this), 60000);
}