Avoid spurious error log when waiting for contact syncs
This commit is contained in:
@@ -1726,9 +1726,9 @@ export async function startApp(): Promise<void> {
|
||||
log.info(`${logId}: postRegistrationSyncs not complete, sending sync`);
|
||||
|
||||
setIsInitialContactSync(true);
|
||||
const syncRequest = await sendSyncRequests();
|
||||
contactSyncComplete = waitForEvent('contactSync:complete');
|
||||
drop(sendSyncRequests());
|
||||
hasSentSyncRequests = true;
|
||||
contactSyncComplete = syncRequest.contactSyncComplete;
|
||||
}
|
||||
|
||||
// 4. Download (or resume download) of link & sync backup
|
||||
|
@@ -1,17 +1,12 @@
|
||||
// Copyright 2025 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { waitForEvent } from '../shims/events';
|
||||
import * as log from '../logging/log';
|
||||
import { singleProtoJobQueue } from '../jobs/singleProtoJobQueue';
|
||||
import MessageSender from './SendMessage';
|
||||
import { toLogFormat } from '../types/errors';
|
||||
|
||||
export async function sendSyncRequests(
|
||||
timeout?: number
|
||||
): Promise<{ contactSyncComplete: Promise<void> }> {
|
||||
const contactSyncComplete = waitForEvent('contactSync:complete', timeout);
|
||||
|
||||
export async function sendSyncRequests(): Promise<void> {
|
||||
log.info('sendSyncRequests: sending sync requests');
|
||||
try {
|
||||
await Promise.all([
|
||||
@@ -28,5 +23,4 @@ export async function sendSyncRequests(
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
return { contactSyncComplete };
|
||||
}
|
||||
|
@@ -54,6 +54,7 @@ import type {
|
||||
import type { SystemTraySetting } from '../types/SystemTraySetting';
|
||||
import { drop } from './drop';
|
||||
import { sendSyncRequests } from '../textsecure/syncRequests';
|
||||
import { waitForEvent } from '../shims/events';
|
||||
|
||||
type SentMediaQualityType = 'standard' | 'high';
|
||||
type NotificationSettingType = 'message' | 'name' | 'count' | 'off';
|
||||
@@ -490,9 +491,11 @@ export function createIPCEvents(
|
||||
|
||||
isPrimary: () => window.textsecure.storage.user.getDeviceId() === 1,
|
||||
syncRequest: async () => {
|
||||
const { contactSyncComplete } = await sendSyncRequests(
|
||||
const contactSyncComplete = waitForEvent(
|
||||
'contactSync:complete',
|
||||
5 * durations.MINUTE
|
||||
);
|
||||
await sendSyncRequests();
|
||||
return contactSyncComplete;
|
||||
},
|
||||
getLastSyncTime: () => window.storage.get('synced_at'),
|
||||
|
Reference in New Issue
Block a user