diff --git a/ts/background.preload.ts b/ts/background.preload.ts index 09da91ace8..dc0a10a1e1 100644 --- a/ts/background.preload.ts +++ b/ts/background.preload.ts @@ -3358,8 +3358,10 @@ export async function startApp(): Promise { } function onViewOnceOpenSync(ev: ViewOnceOpenSyncEvent): void { - const { sourceAci, timestamp } = ev; - log.info(`view once open sync ${sourceAci} ${timestamp}`); + const { sourceAci, timestamp, envelopeTimestamp } = ev; + log.info( + `view once open sync ${envelopeTimestamp} for message ${sourceAci} ${timestamp}` + ); strictAssert(sourceAci, 'ViewOnceOpen without sourceAci'); strictAssert(timestamp, 'ViewOnceOpen without timestamp'); diff --git a/ts/textsecure/MessageReceiver.preload.ts b/ts/textsecure/MessageReceiver.preload.ts index e2e73d6a9a..459368aa0b 100644 --- a/ts/textsecure/MessageReceiver.preload.ts +++ b/ts/textsecure/MessageReceiver.preload.ts @@ -3196,6 +3196,7 @@ export default class MessageReceiver 'handleViewOnceOpen.senderUuid' ), timestamp: sync.timestamp?.toNumber(), + envelopeTimestamp: envelope.timestamp, }, this.#removeFromCache.bind(this, envelope) ); diff --git a/ts/textsecure/WebAPI.preload.ts b/ts/textsecure/WebAPI.preload.ts index 113006b758..93befbf7aa 100644 --- a/ts/textsecure/WebAPI.preload.ts +++ b/ts/textsecure/WebAPI.preload.ts @@ -3539,6 +3539,7 @@ export async function sendMessagesUnauth( urgent, }; + log.info(`send/${timestamp}/${destination}/sendMessagesUnauth`); await _ajax({ host: 'chatService', call: 'messages', @@ -3571,6 +3572,7 @@ export async function sendMessages( urgent, }; + log.info(`send/${timestamp}/${destination}/sendMessages`); await _ajax({ host: 'chatService', call: 'messages', @@ -3606,6 +3608,7 @@ export async function sendWithSenderKey( const urgentParam = `&urgent=${booleanToString(urgent)}`; const storyParam = `&story=${booleanToString(story)}`; + log.info(`send/${timestamp}//sendWithSenderKey`); const response = await _ajax({ host: 'chatService', call: 'multiRecipient', diff --git a/ts/textsecure/messageReceiverEvents.std.ts b/ts/textsecure/messageReceiverEvents.std.ts index 3c34cda260..b3f6848969 100644 --- a/ts/textsecure/messageReceiverEvents.std.ts +++ b/ts/textsecure/messageReceiverEvents.std.ts @@ -300,21 +300,24 @@ export class ConfigurationEvent extends ConfirmableEvent { export type ViewOnceOpenSyncOptions = { sourceAci?: AciString; timestamp?: number; + envelopeTimestamp: number; }; export class ViewOnceOpenSyncEvent extends ConfirmableEvent { public readonly sourceAci?: AciString; + public readonly envelopeTimestamp: number; public readonly timestamp?: number; constructor( - { sourceAci, timestamp }: ViewOnceOpenSyncOptions, + { sourceAci, timestamp, envelopeTimestamp }: ViewOnceOpenSyncOptions, confirm: ConfirmCallback ) { super('viewOnceOpenSync', confirm); this.sourceAci = sourceAci; this.timestamp = timestamp; + this.envelopeTimestamp = envelopeTimestamp; } }