Remove window.textsecure global

This commit is contained in:
Fedor Indutny
2025-10-09 13:03:13 -07:00
committed by GitHub
parent 4e2827af4b
commit bcac163e73
250 changed files with 5177 additions and 5930 deletions

View File

@@ -10,7 +10,10 @@ import { handleMessageSend } from './handleMessageSend.js';
import type { CallbackResultType } from '../textsecure/Types.d.ts';
import type { ConversationModel } from '../models/conversations.js';
import type { SendTypesType } from './handleMessageSend.js';
import type MessageSender from '../textsecure/SendMessage.js';
import {
type MessageSender,
messageSender,
} from '../textsecure/SendMessage.js';
import { areAllErrorsUnregistered } from '../jobs/helpers/areAllErrorsUnregistered.js';
const log = createLogger('wrapWithSyncMessageSend');
@@ -31,17 +34,16 @@ export async function wrapWithSyncMessageSend({
timestamp: number;
}): Promise<void> {
const logId = `wrapWithSyncMessageSend(${parentLogId}, ${timestamp})`;
const sender = window.textsecure.messaging;
if (!sender) {
throw new Error(`${logId}: textsecure.messaging is not available!`);
}
let response: CallbackResultType | undefined;
let error: Error | undefined;
let didSuccessfullySendOne = false;
try {
response = await handleMessageSend(send(sender), { messageIds, sendType });
response = await handleMessageSend(send(messageSender), {
messageIds,
sendType,
});
didSuccessfullySendOne = true;
} catch (thrown) {
if (thrown instanceof SendMessageProtoError) {
@@ -77,7 +79,7 @@ export async function wrapWithSyncMessageSend({
syncMessage: true,
});
await handleMessageSend(
sender.sendSyncMessage({
messageSender.sendSyncMessage({
destinationE164: conversation.get('e164'),
destinationServiceId: conversation.getServiceId(),
encodedDataMessage: dataMessage,