diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index 385b029b79..7850af05e8 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -20442,7 +20442,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see ``` -## libsignal-account-keys 0.1.0, libsignal-core 0.1.0, libsignal-debug 0.99.1, mrp 2.71.0, protobuf 2.71.0, ringrtc 2.71.0, regex-aot 0.1.0, partial-default-derive 0.1.0, partial-default 0.1.0 +## libsignal-account-keys 0.1.0, libsignal-core 0.1.0, libsignal-debug 0.99.1, mrp 2.72.0, protobuf 2.72.0, ringrtc 2.72.0, regex-aot 0.1.0, partial-default-derive 0.1.0, partial-default 0.1.0 ``` GNU AFFERO GENERAL PUBLIC LICENSE @@ -21537,7 +21537,7 @@ THIS SOFTWARE. ``` -## cubeb-core 0.37.0, cubeb-sys 0.37.0, cubeb 0.37.0 +## cubeb-core 0.38.0, cubeb-sys 0.38.0, cubeb 0.38.0 ``` Copyright © 2017 Mozilla Foundation diff --git a/package.json b/package.json index e59d63e720..0613a8bdd5 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@indutny/simple-windows-notifications": "2.0.21", "@signalapp/libsignal-client": "0.101.2", "@signalapp/mute-state-change": "workspace:*", - "@signalapp/ringrtc": "2.71.0", + "@signalapp/ringrtc": "2.72.0", "@signalapp/sqlcipher": "4.1.0", "@signalapp/types": "workspace:*", "@signalapp/windows-ucv": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 423baa0091..1283741f3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -262,8 +262,8 @@ importers: specifier: workspace:* version: link:packages/mute-state-change '@signalapp/ringrtc': - specifier: 2.71.0 - version: 2.71.0(supports-color@8.1.1) + specifier: 2.72.0 + version: 2.72.0(supports-color@8.1.1) '@signalapp/sqlcipher': specifier: 4.1.0 version: 4.1.0 @@ -4754,8 +4754,8 @@ packages: resolution: {integrity: sha512-y2sgqdivlrG41J4Zvt/82xtH/PZjDlgItqlD2g/Cv3ZbjlR6cGhTNXbfNygCJB8nXj+C7I28pjt1Zm3k0pv2mg==, tarball: https://registry.npmjs.org/@signalapp/quill-cjs/-/quill-cjs-2.1.2.tgz} engines: {npm: '>=8.2.3'} - '@signalapp/ringrtc@2.71.0': - resolution: {integrity: sha512-F75ix86XyYoA14x3yPoPwxr6TUq4pdWKhHLcPfZxRR/0xxrvo8PXHvDw5d95YOoi8BJfE0by6DxgrwG9DyvE0Q==, tarball: https://registry.npmjs.org/@signalapp/ringrtc/-/ringrtc-2.71.0.tgz} + '@signalapp/ringrtc@2.72.0': + resolution: {integrity: sha512-Nl34wwawtWNUw7zt9CkzeHCa40d3K2GBJO06LLtIZBPyAOWPXE9WMly/f1yjpXWrV45rrX/bBmPbbk8K72+r9A==, tarball: https://registry.npmjs.org/@signalapp/ringrtc/-/ringrtc-2.72.0.tgz} hasBin: true '@signalapp/sqlcipher@4.1.0': @@ -15750,7 +15750,7 @@ snapshots: lodash: 4.18.1 quill-delta: 5.1.0 - '@signalapp/ringrtc@2.71.0(supports-color@8.1.1)': + '@signalapp/ringrtc@2.72.0(supports-color@8.1.1)': dependencies: https-proxy-agent: 7.0.6(supports-color@8.1.1) tar: 7.5.22 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6d3f634975..fec5105758 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -95,12 +95,11 @@ allowBuilds: '@parcel/watcher@2.5.6': true '@signalapp/libsignal-client@0.100.0': true # duplicate for @signalapp/mock-server '@signalapp/libsignal-client@0.101.2': true - '@signalapp/ringrtc@2.71.0': true + '@signalapp/ringrtc@2.72.0': true '@signalapp/sqlcipher@4.1.0': true '@signalapp/windows-ucv@1.0.1': true '@swc/core@1.10.16': true '@tailwindcss/oxide@4.3.0': true - 'electron@23.3.13': false # duplicate package 'electron@39.8.10': true # duplicate package through react-devtools 'electron@44.2.0': true 'fs-xattr@0.4.0': true @@ -113,6 +112,7 @@ allowBuilds: 'es5-ext': false 'esbuild': false 'utf-8-validate': false + 'electron@23.3.13': false # duplicate package dedupePeers: true dedupePeerDependents: true diff --git a/ts/services/backups/import.preload.ts b/ts/services/backups/import.preload.ts index 9e671996cf..30d350bdae 100644 --- a/ts/services/backups/import.preload.ts +++ b/ts/services/backups/import.preload.ts @@ -1552,7 +1552,7 @@ export class BackupImportStream extends Writable { const callLink: CallLinkType = { roomId: getRoomIdFromRootKey(rootKey), - rootKey: rootKey.toString(), + rootKey: rootKey.toUnredactedString(), adminKey: adminKey?.length ? fromAdminKeyBytes(adminKey) : null, name, restrictions: fromCallLinkRestrictionsProto(restrictions), diff --git a/ts/services/calling.preload.ts b/ts/services/calling.preload.ts index 3d1ae5c385..3dc4b40b1a 100644 --- a/ts/services/calling.preload.ts +++ b/ts/services/calling.preload.ts @@ -924,7 +924,7 @@ class CallingClass { log.info(`${logId}: success`); const state = callLinkStateFromRingRTC(result.value); - const maybeUpdatedRootKey = result.value.rootKey.toString(); + const maybeUpdatedRootKey = result.value.rootKey.toUnredactedString(); const callLink: CallLinkType = { roomId: roomIdHex, diff --git a/ts/test-electron/backup/calling_test.preload.ts b/ts/test-electron/backup/calling_test.preload.ts index 61ba73d894..36cf0de4fe 100644 --- a/ts/test-electron/backup/calling_test.preload.ts +++ b/ts/test-electron/backup/calling_test.preload.ts @@ -181,7 +181,7 @@ describe('backup/calling', () => { const adminKey = CallLinkRootKey.generateAdminPassKey(); const adminKeyBytes: Uint8Array = adminKey; adminCallLink = { - rootKey: adminRootKey.toString(), + rootKey: adminRootKey.toUnredactedString(), roomId: getRoomIdFromRootKey(adminRootKey), adminKey: fromAdminKeyBytes(adminKeyBytes), name: "Let's Talk Rocks", @@ -196,7 +196,7 @@ describe('backup/calling', () => { const rootKey = CallLinkRootKey.generate(); callLink = { - rootKey: rootKey.toString(), + rootKey: rootKey.toUnredactedString(), roomId: getRoomIdFromRootKey(rootKey), adminKey: null, name: "Let's Talk Rocks #2", diff --git a/ts/util/callLinksRingrtc.node.ts b/ts/util/callLinksRingrtc.node.ts index 54c01fce10..5875a3f0ca 100644 --- a/ts/util/callLinksRingrtc.node.ts +++ b/ts/util/callLinksRingrtc.node.ts @@ -79,7 +79,7 @@ export function toRootKeyBytes(rootKey: string): Uint8Array { } export function fromRootKeyBytes(rootKey: Uint8Array): string { - return CallLinkRootKey.fromBytes(rootKey).toString(); + return CallLinkRootKey.fromBytes(rootKey).toUnredactedString(); } /** diff --git a/ts/util/onCallLinkUpdateSync.preload.ts b/ts/util/onCallLinkUpdateSync.preload.ts index 231aa4814f..337bb8f08c 100644 --- a/ts/util/onCallLinkUpdateSync.preload.ts +++ b/ts/util/onCallLinkUpdateSync.preload.ts @@ -47,7 +47,7 @@ export async function onCallLinkUpdateSync( try { if (type === CallLinkUpdateSyncType.Update) { - const rootKeyString = callLinkRootKey.toString(); + const rootKeyString = callLinkRootKey.toUnredactedString(); const adminKeyString = adminKey ? fromAdminKeyBytes(adminKey) : null; window.reduxActions.calling.handleCallLinkUpdate({ rootKey: rootKeyString,