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

Wait for contact sync before opening inbox

Browse source 
Use a canned bootstrap progress animation in lieu of better design.

Fix #271 // FREEBIE
This commit is contained in:
lilia 2015-08-06 12:30:51 -07:00
parent 4f1ce4c493
commit c3d3ec125d
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/libtextsecure.js
View file

@ -39714,6 +39714,7 @@ function generateKeys(count, progressCallback) {
eventTarget.dispatchEvent(ev); eventTarget.dispatchEvent(ev);
contactDetails = contactBuffer.next(); contactDetails = contactBuffer.next();
} }
eventTarget.dispatchEvent(new Event('textsecure:contactsync'));
}); });
}, },
handleGroups: function(groups) { handleGroups: function(groups) {

9
js/options.js
View file

@ -79,8 +79,17 @@
var accountManager = new bg.textsecure.AccountManager(); var accountManager = new bg.textsecure.AccountManager();
accountManager.registerSecondDevice(setProvisioningUrl, confirmNumber, incrementCounter).then(function() { accountManager.registerSecondDevice(setProvisioningUrl, confirmNumber, incrementCounter).then(function() {
var launch = function() {
bg.openInbox(); bg.openInbox();
bg.removeEventListener('textsecure:contactsync', launch);
clearTimeout(timeout);
window.close(); window.close();
};
var timeout = setTimeout(launch, 60000);
bg.addEventListener('textsecure:contactsync', launch);
$('.progress-dialog .status').text('Syncing groups and contacts');
$('.progress-dialog .bar').addClass('progress-bar-striped active');
}).catch(function(e) { }).catch(function(e) {
if (e.name === 'HTTPError' && e.code == 411) { if (e.name === 'HTTPError' && e.code == 411) {
$('.progress-dialog').hide(); $('.progress-dialog').hide();

1
libtextsecure/message_receiver.js
View file

@ -188,6 +188,7 @@
eventTarget.dispatchEvent(ev); eventTarget.dispatchEvent(ev);
contactDetails = contactBuffer.next(); contactDetails = contactBuffer.next();
} }
eventTarget.dispatchEvent(new Event('textsecure:contactsync'));
}); });
}, },
handleGroups: function(groups) { handleGroups: function(groups) {

2
options.html
View file

@ -114,7 +114,7 @@
</div> </div>
<div class='progress-dialog'> <div class='progress-dialog'>
<div class='status'></div> <div class='status'></div>
<div class='bar-container'><div class='bar'></div></div> <div class='bar-container'><div class='bar progress-bar'></div></div>
</div> </div>
<div class='error-dialog clearfix'> <div class='error-dialog clearfix'>
<div class='panel'>Sorry, you have too many devices registered already. Try removing some.</div> <div class='panel'>Sorry, you have too many devices registered already. Try removing some.</div>