Remove legacy import flow
This commit is contained in:
parent
2105b5341a
commit
a840e2e5b1
15 changed files with 20 additions and 559 deletions
|
@ -382,10 +382,7 @@
|
|||
|
||||
showStickerPack: async (packId, key) => {
|
||||
// We can get these events even if the user has never linked this instance.
|
||||
if (
|
||||
Whisper.Import.isIncomplete() ||
|
||||
!window.Signal.Util.Registration.everDone()
|
||||
) {
|
||||
if (!window.Signal.Util.Registration.everDone()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1287,13 +1284,6 @@
|
|||
});
|
||||
}
|
||||
|
||||
Whisper.events.on('setupWithImport', () => {
|
||||
const { appView } = window.owsDesktopApp;
|
||||
if (appView) {
|
||||
appView.openImporter();
|
||||
}
|
||||
});
|
||||
|
||||
Whisper.events.on('setupAsNewDevice', () => {
|
||||
const { appView } = window.owsDesktopApp;
|
||||
if (appView) {
|
||||
|
@ -1382,10 +1372,7 @@
|
|||
Whisper.ExpiringMessagesListener.init(Whisper.events);
|
||||
Whisper.TapToViewMessagesListener.init(Whisper.events);
|
||||
|
||||
if (Whisper.Import.isIncomplete()) {
|
||||
window.log.info('Import was interrupted, showing import error screen');
|
||||
appView.openImporter();
|
||||
} else if (window.Signal.Util.Registration.everDone()) {
|
||||
if (window.Signal.Util.Registration.everDone()) {
|
||||
// listeners
|
||||
Whisper.RotateSignedPreKeyListener.init(Whisper.events, newVersion);
|
||||
window.Signal.RefreshSenderCertificate.initialize({
|
||||
|
@ -1399,8 +1386,6 @@
|
|||
appView.openInbox({
|
||||
initialLoadComplete,
|
||||
});
|
||||
} else if (window.isImportMode()) {
|
||||
appView.openImporter();
|
||||
} else {
|
||||
appView.openInstaller();
|
||||
}
|
||||
|
@ -1513,9 +1498,6 @@
|
|||
if (!window.Signal.Util.Registration.everDone()) {
|
||||
return;
|
||||
}
|
||||
if (Whisper.Import.isIncomplete()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (messageReceiver) {
|
||||
await messageReceiver.stopProcessing();
|
||||
|
@ -1685,17 +1667,6 @@
|
|||
);
|
||||
});
|
||||
}
|
||||
|
||||
if (Whisper.Import.isComplete()) {
|
||||
wrap(
|
||||
textsecure.messaging.sendRequestConfigurationSyncMessage(sendOptions)
|
||||
).catch(error => {
|
||||
window.log.error(
|
||||
'Import complete, but failed to send sync message',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
storage.onready(async () => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue