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

Refactor initial sync codepath to application layer

Browse source 
To reduce dependence on the message sending module, AccountManager
should send no sync requests itself.
This commit is contained in:
lilia 2015-08-31 10:40:25 -07:00
parent 6123c419d0
commit c8e51563a0
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/background.js
View file

@ -37,7 +37,9 @@
if (textsecure.registration.isDone()) {
init();
}
extension.on('registration_done', init);
extension.on('registration_done', function() {
init(true);
});
setUnreadCount(storage.get("unreadCount", 0));
@ -52,7 +54,8 @@
if (open) {
openInbox();
}
function init() {
function init(firstRun) {
window.removeEventListener('online', init);
if (!textsecure.registration.isDone()) { return; }
@ -63,6 +66,7 @@
var PASSWORD = storage.get('password');
var mySignalingKey = storage.get('signaling_key');
// initialize the socket and start listening for messages
messageReceiver = new textsecure.MessageReceiver(URL, USERNAME, PASSWORD, mySignalingKey);
messageReceiver.addEventListener('message', onMessageReceived);
messageReceiver.addEventListener('receipt', onDeliveryReceipt);
@ -72,6 +76,11 @@
messageReceiver.addEventListener('error', onError);
messageReceiver.addEventListener('contactsync', onContactSyncComplete);
if (firstRun === true && textsecure.storage.user.getDeviceId() != '1') {
textsecure.messaging.sendRequestContactSyncMessage();
textsecure.messaging.sendRequestGroupSyncMessage();
}
}
function onContactSyncComplete() {

4
js/libtextsecure.js
View file

@ -39279,9 +39279,7 @@ TextSecureServer = function () {
}).then(function() {
return generateKeys(100, progressCallback);
}).then(TextSecureServer.registerKeys).
then(textsecure.registration.done).
then(textsecure.messaging.sendRequestContactSyncMessage).
then(textsecure.messaging.sendRequestGroupSyncMessage);
then(textsecure.registration.done);
},
refreshPreKeys: function() {
return TextSecureServer.getMyKeys().then(function(preKeyCount) {

4
libtextsecure/account_manager.js
View file

@ -66,9 +66,7 @@
}).then(function() {
return generateKeys(100, progressCallback);
}).then(TextSecureServer.registerKeys).
then(textsecure.registration.done).
then(textsecure.messaging.sendRequestContactSyncMessage).
then(textsecure.messaging.sendRequestGroupSyncMessage);
then(textsecure.registration.done);
},
refreshPreKeys: function() {
return TextSecureServer.getMyKeys().then(function(preKeyCount) {