Prevent showing inbox if secondary device registration is still ongoing

pull/439/head
sachaaaaa 6 years ago
parent 5eab2098b6
commit 415ea7992c

@ -587,7 +587,10 @@
if (Whisper.Import.isIncomplete()) { if (Whisper.Import.isIncomplete()) {
window.log.info('Import was interrupted, showing import error screen'); window.log.info('Import was interrupted, showing import error screen');
appView.openImporter(); appView.openImporter();
} else if (Whisper.Registration.everDone()) { } else if (
Whisper.Registration.everDone() &&
!Whisper.Registration.ongoingSecondaryDeviceRegistration()
) {
// listeners // listeners
Whisper.RotateSignedPreKeyListener.init(Whisper.events, newVersion); Whisper.RotateSignedPreKeyListener.init(Whisper.events, newVersion);
// window.Signal.RefreshSenderCertificate.initialize({ // window.Signal.RefreshSenderCertificate.initialize({

@ -21,6 +21,9 @@
storage.get('chromiumRegistrationDone') === '' storage.get('chromiumRegistrationDone') === ''
); );
}, },
ongoingSecondaryDeviceRegistration() {
return storage.get('secondaryDeviceStatus') === 'ongoing';
},
remove() { remove() {
storage.remove('chromiumRegistrationDone'); storage.remove('chromiumRegistrationDone');
}, },

Loading…
Cancel
Save