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

Refactor registration event

Browse source 
Make AccountManager into an event target for better separation between
app and service-library handling of registration events.
This commit is contained in:
lilia 2016-09-20 13:42:33 -07:00
parent 6dcff46e26
commit 7b3b01bdf6
6 changed files with 57 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
js/background.js
View file

@ -24,10 +24,10 @@
extension.onLaunched(function() {
console.log('extension launched');
storage.onready(function() {
if (textsecure.registration.everDone()) {
if (Whisper.Registration.everDone()) {
openInbox();
}
if (!textsecure.registration.isDone()) {
if (!Whisper.Registration.isDone()) {
extension.install();
}
});
@ -47,7 +47,14 @@
window.getAccountManager = function() {
var USERNAME = storage.get('number_id');
var PASSWORD = storage.get('password');
return new textsecure.AccountManager(SERVER_URL, SERVER_PORTS, USERNAME, PASSWORD);
var accountManager = new textsecure.AccountManager(
SERVER_URL, SERVER_PORTS, USERNAME, PASSWORD
);
accountManager.addEventListener('registration', function() {
Whisper.Registration.markDone();
extension.trigger('registration_done');
});
return accountManager;
};
storage.fetch();
@ -55,7 +62,7 @@
window.dispatchEvent(new Event('storage_ready'));
setUnreadCount(storage.get("unreadCount", 0));
if (textsecure.registration.isDone()) {
if (Whisper.Registration.isDone()) {
extension.keepAwake();
init();
}
@ -76,7 +83,7 @@
function init(firstRun) {
window.removeEventListener('online', init);
if (!textsecure.registration.isDone()) { return; }
if (!Whisper.Registration.isDone()) { return; }
if (messageReceiver) { messageReceiver.close(); }
@ -189,7 +196,7 @@
console.log(e.stack);
if (e.name === 'HTTPError' && (e.code == 401 || e.code == 403)) {
textsecure.registration.remove();
Whisper.Registration.remove();
extension.install();
return;
}