Keep onboarding story message ids on unlink

This commit is contained in:
Scott Nonnenberg 2023-08-22 09:26:28 -07:00 committed by GitHub
parent 41d6dadb78
commit b7c17212c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 29 deletions

View file

@ -167,7 +167,6 @@ import { SeenStatus } from './MessageSeenStatus';
import MessageSender from './textsecure/SendMessage';
import type AccountManager from './textsecure/AccountManager';
import { onStoryRecipientUpdate } from './util/onStoryRecipientUpdate';
import { downloadOnboardingStory } from './util/downloadOnboardingStory';
import { flushAttachmentDownloadQueue } from './util/attachmentDownloadQueue';
import { StartupQueue } from './util/StartupQueue';
import { showConfirmationDialog } from './util/showConfirmationDialog';
@ -1146,7 +1145,6 @@ export async function startApp(): Promise<void> {
(async () => {
menuOptions = await window.SignalContext.getMenuOptions();
})(),
downloadOnboardingStory(),
]);
await window.ConversationController.checkForConflicts();
} catch (error) {
@ -1505,19 +1503,19 @@ export async function startApp(): Promise<void> {
log.info('Expiration start timestamp cleanup: complete');
log.info('listening for registration events');
window.Whisper.events.on('registration_done', () => {
window.Whisper.events.on('registration_done', async () => {
log.info('handling registration event');
strictAssert(server !== undefined, 'WebAPI not ready');
void server.authenticate(
await server.authenticate(
window.textsecure.storage.user.getWebAPICredentials()
);
// Cancel throttled calls to refreshRemoteConfig since our auth changed.
window.Signal.RemoteConfig.maybeRefreshRemoteConfig.cancel();
void window.Signal.RemoteConfig.maybeRefreshRemoteConfig(server);
drop(window.Signal.RemoteConfig.maybeRefreshRemoteConfig(server));
void connect(true);
drop(connect(true));
});
cancelInitializationMessage();
@ -3013,6 +3011,9 @@ export async function startApp(): Promise<void> {
}
await window.textsecure.storage.put(VERSION_KEY, window.getVersion());
// Re-hydrate items from memory; removeAllConfiguration above changed database
await window.storage.fetch();
log.info('unlinkAndDisconnect: Successfully cleared local configuration');
} catch (eraseError) {
log.error(