From fa887f7b1aeda94e74e5c5e398dbff048b36c28b Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:53:03 -0600 Subject: [PATCH 01/54] Polls: allow multiple votes by default Co-authored-by: yash-signal --- ts/components/PollCreateModal.dom.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/PollCreateModal.dom.tsx b/ts/components/PollCreateModal.dom.tsx index 4ef1be04a..f52c5bf90 100644 --- a/ts/components/PollCreateModal.dom.tsx +++ b/ts/components/PollCreateModal.dom.tsx @@ -47,7 +47,7 @@ export function PollCreateModal({ { id: generateUuid(), value: '' }, { id: generateUuid(), value: '' }, ]); - const [allowMultiple, setAllowMultiple] = useState(false); + const [allowMultiple, setAllowMultiple] = useState(true); const [emojiPickerOpenForOption, setEmojiPickerOpenForOption] = useState< string | null >(null); From e751592fe24071e7c714cf18e9ca17a538976fbb Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:52:00 -0600 Subject: [PATCH 02/54] Remove poll feature flag gates Co-authored-by: yash-signal --- images/icons/v3/attach/attach.svg | 1 - stylesheets/components/CompositionArea.scss | 40 ------------- ts/RemoteConfig.dom.ts | 6 -- ts/background.preload.ts | 26 +-------- ts/components/CompositionArea.dom.tsx | 25 ++------ ts/components/conversation/Message.dom.tsx | 3 +- ts/messages/handleDataMessage.preload.ts | 7 +-- ts/types/Polls.dom.ts | 65 --------------------- ts/util/enqueuePollCreateForSend.dom.ts | 5 -- 9 files changed, 8 insertions(+), 170 deletions(-) delete mode 100644 images/icons/v3/attach/attach.svg diff --git a/images/icons/v3/attach/attach.svg b/images/icons/v3/attach/attach.svg deleted file mode 100644 index 5230a8948..000000000 --- a/images/icons/v3/attach/attach.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/stylesheets/components/CompositionArea.scss b/stylesheets/components/CompositionArea.scss index 911968e28..b54c5316e 100644 --- a/stylesheets/components/CompositionArea.scss +++ b/stylesheets/components/CompositionArea.scss @@ -249,44 +249,4 @@ } } } - - &__attach-file { - width: 32px; - height: 32px; - border-radius: 4px; - padding: 0; - border: none; - background: transparent; - display: flex; - align-items: center; - justify-content: center; - - @include mixins.keyboard-mode { - &:focus { - outline: 2px solid variables.$color-ultramarine; - } - } - - outline: none; - - &:before { - content: ''; - display: inline-block; - width: 20px; - height: 20px; - - @include mixins.light-theme { - @include mixins.color-svg( - '../images/icons/v3/attach/attach.svg', - variables.$color-gray-75 - ); - } - @include mixins.dark-theme { - @include mixins.color-svg( - '../images/icons/v3/attach/attach.svg', - variables.$color-gray-15 - ); - } - } - } } diff --git a/ts/RemoteConfig.dom.ts b/ts/RemoteConfig.dom.ts index 7fc52f25c..22a8bc92b 100644 --- a/ts/RemoteConfig.dom.ts +++ b/ts/RemoteConfig.dom.ts @@ -71,12 +71,6 @@ const ScalarKeys = [ 'desktop.retryRespondMaxAge', 'desktop.senderKey.retry', 'desktop.senderKeyMaxAge', - 'desktop.pollReceive.alpha', - 'desktop.pollReceive.beta1', - 'desktop.pollReceive.prod1', - 'desktop.pollSend.alpha', - 'desktop.pollSend.beta', - 'desktop.pollSend.prod', 'desktop.recentGifs.allowLegacyTenorCdnUrls', 'global.attachments.maxBytes', 'global.attachments.maxReceiveBytes', diff --git a/ts/background.preload.ts b/ts/background.preload.ts index cf0a59e7f..386d4ac4a 100644 --- a/ts/background.preload.ts +++ b/ts/background.preload.ts @@ -67,11 +67,7 @@ import { RoutineProfileRefresher } from './routineProfileRefresh.preload.js'; import { isOlderThan } from './util/timestamp.std.js'; import { isValidReactionEmoji } from './reactions/isValidReactionEmoji.std.js'; import { safeParsePartial } from './util/schemas.std.js'; -import { - PollVoteSchema, - PollTerminateSchema, - isPollReceiveEnabled, -} from './types/Polls.dom.js'; +import { PollVoteSchema, PollTerminateSchema } from './types/Polls.dom.js'; import type { ConversationModel } from './models/conversations.preload.js'; import { isIncoming } from './messages/helpers.std.js'; import { getAuthor } from './messages/sources.preload.js'; @@ -2519,11 +2515,6 @@ export async function startApp(): Promise { } if (data.message.pollVote) { - if (!isPollReceiveEnabled()) { - log.warn('Dropping PollVote because the flag is disabled'); - confirm(); - return; - } const { pollVote, timestamp } = data.message; const parsed = safeParsePartial(PollVoteSchema, pollVote); @@ -2561,11 +2552,6 @@ export async function startApp(): Promise { } if (data.message.pollTerminate) { - if (!isPollReceiveEnabled()) { - log.warn('Dropping PollTerminate because the flag is disabled'); - confirm(); - return; - } const { pollTerminate, timestamp, expireTimer } = data.message; const parsedTerm = safeParsePartial(PollTerminateSchema, pollTerminate); @@ -3029,11 +3015,6 @@ export async function startApp(): Promise { } if (data.message.pollVote) { - if (!isPollReceiveEnabled()) { - log.warn('Dropping PollVote because the flag is disabled'); - confirm(); - return; - } const { pollVote, timestamp } = data.message; const parsed = safeParsePartial(PollVoteSchema, pollVote); @@ -3074,11 +3055,6 @@ export async function startApp(): Promise { } if (data.message.pollTerminate) { - if (!isPollReceiveEnabled()) { - log.warn('Dropping PollTerminate because the flag is disabled'); - confirm(); - return; - } const { pollTerminate, timestamp, expireTimer } = data.message; const parsedTerm = safeParsePartial(PollTerminateSchema, pollTerminate); diff --git a/ts/components/CompositionArea.dom.tsx b/ts/components/CompositionArea.dom.tsx index 0effc83a7..f9dc0d340 100644 --- a/ts/components/CompositionArea.dom.tsx +++ b/ts/components/CompositionArea.dom.tsx @@ -87,7 +87,7 @@ import { FunPickerButton } from './fun/FunButton.dom.js'; import { AxoDropdownMenu } from '../axo/AxoDropdownMenu.dom.js'; import { AxoIconButton } from '../axo/AxoIconButton.dom.js'; import { tw } from '../axo/tw.dom.js'; -import { isPollSendEnabled, type PollCreateType } from '../types/Polls.dom.js'; +import type { PollCreateType } from '../types/Polls.dom.js'; import { PollCreateModal } from './PollCreateModal.dom.js'; import { useDocumentKeyDown } from '../hooks/useDocumentKeyDown.dom.js'; @@ -823,11 +823,8 @@ export const CompositionArea = memo(function CompositionArea({ 'flex size-8 shrink-0 items-center justify-center' ); - let attButton; - if (draftEditMessage || linkPreviewResult || isRecording) { - attButton = undefined; - } else if (isPollSendEnabled()) { - attButton = ( + const composerAddMenuButton = + draftEditMessage || linkPreviewResult || isRecording ? null : (
@@ -860,18 +857,6 @@ export const CompositionArea = memo(function CompositionArea({
); - } else { - attButton = ( -
-
- ); - } const sendButtonFragment = !draftEditMessage ? ( <> @@ -1304,7 +1289,7 @@ export const CompositionArea = memo(function CompositionArea({ <> {!dirty ? micButtonFragment : null} {editMessageFragment} - {attButton} + {composerAddMenuButton} )}
@@ -1316,7 +1301,7 @@ export const CompositionArea = memo(function CompositionArea({ )} > {leftHandSideButtonsFragment} - {attButton} + {composerAddMenuButton} {!dirty ? micButtonFragment : null} {editMessageFragment} {dirty || !shouldShowMicrophone ? sendButtonFragment : null} diff --git a/ts/components/conversation/Message.dom.tsx b/ts/components/conversation/Message.dom.tsx index 6e1d88d63..f4681c849 100644 --- a/ts/components/conversation/Message.dom.tsx +++ b/ts/components/conversation/Message.dom.tsx @@ -98,7 +98,6 @@ import { isPaymentNotificationEvent } from '../../types/Payment.std.js'; import type { AnyPaymentEvent } from '../../types/Payment.std.js'; import { getPaymentEventDescription } from '../../messages/payments.std.js'; import { PanelType } from '../../types/Panels.std.js'; -import { isPollReceiveEnabled } from '../../types/Polls.dom.js'; import type { PollWithResolvedVotersType } from '../../state/selectors/message.preload.js'; import { PollMessageContents } from './poll-message/PollMessageContents.dom.js'; import { openLinkInWebBrowser } from '../../util/openLinkInWebBrowser.dom.js'; @@ -2062,7 +2061,7 @@ export class Message extends React.PureComponent { public renderPoll(): React.JSX.Element | null { const { poll, direction, i18n, id, endPoll, canEndPoll } = this.props; - if (!poll || !isPollReceiveEnabled()) { + if (!poll) { return null; } return ( diff --git a/ts/messages/handleDataMessage.preload.ts b/ts/messages/handleDataMessage.preload.ts index 1075fc48c..328f4586c 100644 --- a/ts/messages/handleDataMessage.preload.ts +++ b/ts/messages/handleDataMessage.preload.ts @@ -68,7 +68,7 @@ import { import { saveAndNotify } from './saveAndNotify.preload.js'; import { MessageModel } from '../models/messages.preload.js'; import { safeParsePartial } from '../util/schemas.std.js'; -import { PollCreateSchema, isPollReceiveEnabled } from '../types/Polls.dom.js'; +import { PollCreateSchema } from '../types/Polls.dom.js'; import type { SentEventData } from '../textsecure/messageReceiverEvents.std.js'; import type { @@ -472,11 +472,6 @@ export async function handleDataMessage( let validatedPollCreate: z.infer | undefined; if (initialMessage.pollCreate) { - if (!isPollReceiveEnabled()) { - log.warn(`${idLog}: Dropping PollCreate because flag is not enabled`); - confirm(); - return; - } const result = safeParsePartial( PollCreateSchema, initialMessage.pollCreate diff --git a/ts/types/Polls.dom.ts b/ts/types/Polls.dom.ts index 285e4894d..d66e0ba45 100644 --- a/ts/types/Polls.dom.ts +++ b/ts/types/Polls.dom.ts @@ -3,13 +3,6 @@ import { z } from 'zod'; import { hasAtMostGraphemes } from '../util/grapheme.std.js'; -import { - Environment, - getEnvironment, - isMockEnvironment, -} from '../environment.std.js'; -import * as RemoteConfig from '../RemoteConfig.dom.js'; -import { isAlpha, isBeta, isProduction } from '../util/version.std.js'; import { isFeaturedEnabledNoRedux } from '../util/isFeatureEnabled.dom.js'; import type { SendStateByConversationId } from '../messages/MessageSendState.std.js'; import { aciSchema } from './ServiceId.std.js'; @@ -117,64 +110,6 @@ export type PollCreateType = Pick< 'question' | 'options' | 'allowMultiple' >; -export function isPollReceiveEnabled(): boolean { - const env = getEnvironment(); - - if ( - env === Environment.Development || - env === Environment.Test || - env === Environment.Staging || - isMockEnvironment() - ) { - return true; - } - - const version = window.getVersion?.(); - - if (version != null) { - if (isProduction(version)) { - return RemoteConfig.isEnabled('desktop.pollReceive.prod1'); - } - if (isBeta(version)) { - return RemoteConfig.isEnabled('desktop.pollReceive.beta1'); - } - if (isAlpha(version)) { - return RemoteConfig.isEnabled('desktop.pollReceive.alpha'); - } - } - - return false; -} - -export function isPollSendEnabled(): boolean { - const env = getEnvironment(); - - if ( - env === Environment.Development || - env === Environment.Test || - env === Environment.Staging || - isMockEnvironment() - ) { - return true; - } - - const version = window.getVersion?.(); - - if (version != null) { - if (isProduction(version)) { - return RemoteConfig.isEnabled('desktop.pollSend.prod'); - } - if (isBeta(version)) { - return RemoteConfig.isEnabled('desktop.pollSend.beta'); - } - if (isAlpha(version)) { - return RemoteConfig.isEnabled('desktop.pollSend.alpha'); - } - } - - return false; -} - export function isPollSend1to1Enabled(): boolean { return isFeaturedEnabledNoRedux({ betaKey: 'desktop.pollSend1to1.beta', diff --git a/ts/util/enqueuePollCreateForSend.dom.ts b/ts/util/enqueuePollCreateForSend.dom.ts index e6d64972c..ab448fd99 100644 --- a/ts/util/enqueuePollCreateForSend.dom.ts +++ b/ts/util/enqueuePollCreateForSend.dom.ts @@ -5,7 +5,6 @@ import type { ConversationModel } from '../models/conversations.preload.js'; import { isDirectConversation } from './whatTypeOfConversation.dom.js'; import { isPollSend1to1Enabled, - isPollSendEnabled, type PollCreateType, } from '../types/Polls.dom.js'; @@ -13,10 +12,6 @@ export async function enqueuePollCreateForSend( conversation: ConversationModel, poll: PollCreateType ): Promise { - if (!isPollSendEnabled()) { - throw new Error('enqueuePollCreateForSend: poll sending is not enabled'); - } - if ( isDirectConversation(conversation.attributes) && !isPollSend1to1Enabled() From f83121e080b2292ef272267ae67cae7bc993e532 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:52:14 -0600 Subject: [PATCH 03/54] Improve thumbnail accounting for quotes Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com> --- ts/util/doubleCheckMissingQuoteReference.preload.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ts/util/doubleCheckMissingQuoteReference.preload.ts b/ts/util/doubleCheckMissingQuoteReference.preload.ts index cc4a3f9ea..a13f58504 100644 --- a/ts/util/doubleCheckMissingQuoteReference.preload.ts +++ b/ts/util/doubleCheckMissingQuoteReference.preload.ts @@ -11,8 +11,7 @@ import { createLogger } from '../logging/log.std.js'; import { isQuoteAMatch } from '../messages/quotes.preload.js'; import { shouldTryToCopyFromQuotedMessage } from '../messages/helpers.std.js'; import { copyQuoteContentFromOriginal } from '../messages/copyQuote.preload.js'; -import { queueUpdateMessage } from './messageBatcher.preload.js'; -import { drop } from './drop.std.js'; +import { maybeDeleteAttachmentFile } from './migrations.preload.js'; const log = createLogger('doubleCheckMissingQuoteReference'); @@ -68,6 +67,8 @@ export async function doubleCheckMissingQuoteReference( return; } + const existingThumbnailPath = quote.attachments[0]?.thumbnail?.path; + message.set({ quote: { ...quote, @@ -84,6 +85,11 @@ export async function doubleCheckMissingQuoteReference( referencedMessageNotFound: false, }, }); - drop(queueUpdateMessage(message.attributes)); + + await window.MessageCache.saveMessage(message.attributes); + + if (existingThumbnailPath) { + await maybeDeleteAttachmentFile(existingThumbnailPath); + } } } From 81ce4bf241dd9474e981f53f642b6e8dc420e4f1 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:52:26 -0600 Subject: [PATCH 04/54] Update to libsignal v0.87.4 Co-authored-by: andrew-signal --- ACKNOWLEDGMENTS.md | 357 +++++++++++++++++++++++++++++------------ package.json | 4 +- pnpm-lock.yaml | 10 +- ts/RemoteConfig.dom.ts | 4 + 4 files changed, 261 insertions(+), 114 deletions(-) diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index 2c5b27bb7..6050ab5e3 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -7212,6 +7212,250 @@ You should also get your employer (if you work as a programmer) or school, if an ``` +## boring-sys 5.0.2 + +``` + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Licenses for support code +------------------------- + +Parts of the TLS test suite are under the Go license. This code is not included +in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so +distributing code linked against BoringSSL does not trigger this license: + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +``` + ## ring 0.17.14 ``` @@ -8503,7 +8747,7 @@ limitations under the License. ``` -## boring 4.18.0 +## boring 5.0.2 ``` Copyright 2011-2017 Google Inc. @@ -8795,24 +9039,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` -## boring-sys 4.18.0 - -``` -/* Copyright (c) 2015, Google Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -``` - ## untrusted 0.9.0 ``` @@ -9104,7 +9330,7 @@ DEALINGS IN THE SOFTWARE. ``` -## backtrace 0.3.76, cc 1.2.52, cfg-if 1.0.4, cmake 0.1.48, find-msvc-tools 0.1.7, openssl-probe 0.2.0, rustc-demangle 0.1.26, socket2 0.6.1 +## backtrace 0.3.76, cc 1.2.52, cfg-if 1.0.4, cmake 0.1.57, find-msvc-tools 0.1.7, openssl-probe 0.2.0, rustc-demangle 0.1.26, socket2 0.6.1 ``` Copyright (c) 2014 Alex Crichton @@ -9135,7 +9361,7 @@ DEALINGS IN THE SOFTWARE. ``` -## boring-sys 4.18.0 +## boring-sys 5.0.2 ``` Copyright (c) 2014 Alex Crichton @@ -9431,7 +9657,7 @@ THE SOFTWARE. ``` -## either 1.15.0, itertools 0.13.0, itertools 0.14.0, petgraph 0.7.1, serde_with 3.16.1, serde_with_macros 3.16.1 +## either 1.15.0, itertools 0.10.5, itertools 0.14.0, petgraph 0.7.1, serde_with 3.16.1, serde_with_macros 3.16.1 ``` Copyright (c) 2015 @@ -9675,31 +9901,6 @@ DEALINGS IN THE SOFTWARE. ``` -## boring-sys 4.18.0 - -``` -Copyright (c) 2015-2016 the fiat-crypto authors (see -https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS). - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - ## fixedbitset 0.5.7 ``` @@ -10038,7 +10239,7 @@ SOFTWARE. ``` -## tokio-boring 4.18.0 +## tokio-boring 5.0.2 ``` Copyright (c) 2016 Tokio contributors @@ -12754,7 +12955,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` -## curve25519-dalek-derive 0.1.1, adler2 2.0.1, anyhow 1.0.100, async-trait 0.1.89, atomic-waker 1.1.2, auto_enums 0.8.7, derive_utils 0.15.0, displaydoc 0.2.5, dyn-clone 1.0.20, fastrand 2.3.0, home 0.5.11, itoa 1.0.17, linkme-impl 0.3.35, linkme 0.3.35, linux-raw-sys 0.11.0, linux-raw-sys 0.4.15, minimal-lexical 0.2.1, num_enum 0.7.5, num_enum_derive 0.7.5, once_cell 1.21.3, paste 1.0.15, pin-project-internal 1.1.10, pin-project-lite 0.2.16, pin-project 1.1.10, prettyplease 0.2.37, proc-macro-crate 3.4.0, proc-macro2 1.0.105, quote 1.0.43, rustix 0.38.44, rustix 1.1.3, rustversion 1.0.22, semver 1.0.27, send_wrapper 0.6.0, serde 1.0.228, serde_core 1.0.228, serde_derive 1.0.228, serde_json 1.0.149, syn-mid 0.6.0, syn 2.0.114, thiserror-impl 1.0.69, thiserror-impl 2.0.17, thiserror 1.0.69, thiserror 2.0.17, unicode-ident 1.0.22, utf-8 0.7.6, zmij 1.0.12 +## curve25519-dalek-derive 0.1.1, adler2 2.0.1, anyhow 1.0.100, async-trait 0.1.89, atomic-waker 1.1.2, auto_enums 0.8.7, derive_utils 0.15.0, displaydoc 0.2.5, dyn-clone 1.0.20, fastrand 2.3.0, home 0.5.11, itoa 1.0.17, linkme-impl 0.3.35, linkme 0.3.35, linux-raw-sys 0.11.0, linux-raw-sys 0.4.15, minimal-lexical 0.2.1, num_enum 0.7.5, num_enum_derive 0.7.5, once_cell 1.21.3, paste 1.0.15, pin-project-internal 1.1.10, pin-project-lite 0.2.16, pin-project 1.1.10, prettyplease 0.2.37, proc-macro-crate 3.4.0, proc-macro2 1.0.105, quote 1.0.43, ref-cast-impl 1.0.25, ref-cast 1.0.25, rustix 0.38.44, rustix 1.1.3, rustversion 1.0.22, semver 1.0.27, send_wrapper 0.6.0, serde 1.0.228, serde_core 1.0.228, serde_derive 1.0.228, serde_json 1.0.149, syn-mid 0.6.0, syn 2.0.114, thiserror-impl 1.0.69, thiserror-impl 2.0.17, thiserror 1.0.69, thiserror 2.0.17, unicode-ident 1.0.22, utf-8 0.7.6, zmij 1.0.12 ``` Permission is hereby granted, free of charge, to any @@ -13683,64 +13884,6 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice ``` -## boring-sys 4.18.0 - -``` -/* ==================================================================== - * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ -``` - ## unicode-ident 1.0.22 ``` diff --git a/package.json b/package.json index d2d73c32e..f139c1a6b 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "@react-aria/utils": "3.25.3", "@react-spring/web": "10.0.3", "@react-types/shared": "3.27.0", - "@signalapp/libsignal-client": "0.87.1", + "@signalapp/libsignal-client": "0.87.4", "@signalapp/minimask": "1.0.1", "@signalapp/mute-state-change": "workspace:1.0.0", "@signalapp/quill-cjs": "2.1.2", @@ -554,7 +554,7 @@ "libasound2", "libpulse0", "libxss1", - "libc6 (>= 2.31)", + "libc6 (>= 2.34)", "libgtk-3-0", "libgbm1", "libx11-xcb1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90cdec25a..5502da02f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -126,8 +126,8 @@ importers: specifier: 3.27.0 version: 3.27.0(react@18.3.1) '@signalapp/libsignal-client': - specifier: 0.87.1 - version: 0.87.1 + specifier: 0.87.4 + version: 0.87.4 '@signalapp/minimask': specifier: 1.0.1 version: 1.0.1 @@ -3486,8 +3486,8 @@ packages: '@signalapp/libsignal-client@0.76.7': resolution: {integrity: sha512-iGWTlFkko7IKlm96Iy91Wz5sIN089nj02ifOk6BWtLzeVi0kFaNj+jK26Sl1JRXy/VfXevcYtiOivOg43BPqpg==} - '@signalapp/libsignal-client@0.87.1': - resolution: {integrity: sha512-rQZ1JWTa82fVqO1D7a1mQresw8cIqwT7bUvzfGpSRiXO1Gvm5U6eiUW/9nPmTT0MMelGXU/4fDx9jXF/r4hoCw==} + '@signalapp/libsignal-client@0.87.4': + resolution: {integrity: sha512-TFfckCASjs00TUheBagyJf5ixoDo5aazz06Co+Mk8+Ie9WGIe6jt0GsLdbxu14PDBxJsEqvFxTmYAgSPGGKYCw==} '@signalapp/minimask@1.0.1': resolution: {integrity: sha512-QAwo0joA60urTNbW9RIz6vLKQjy+jdVtH7cvY0wD9PVooD46MAjE40MLssp4xUJrph91n2XvtJ3pbEUDrmT2AA==} @@ -14270,7 +14270,7 @@ snapshots: type-fest: 4.26.1 uuid: 11.0.2 - '@signalapp/libsignal-client@0.87.1': + '@signalapp/libsignal-client@0.87.4': dependencies: node-gyp-build: 4.8.4 type-fest: 4.26.1 diff --git a/ts/RemoteConfig.dom.ts b/ts/RemoteConfig.dom.ts index 22a8bc92b..18662a280 100644 --- a/ts/RemoteConfig.dom.ts +++ b/ts/RemoteConfig.dom.ts @@ -93,8 +93,12 @@ const KnownDesktopLibsignalNetKeys = [ 'desktop.libsignalNet.chatRequestConnectionCheckTimeoutMillis', 'desktop.libsignalNet.disableNagleAlgorithm.beta', 'desktop.libsignalNet.disableNagleAlgorithm', + 'desktop.libsignalNet.grpc.AccountsAnonymousCheckAccountExistence.beta', + 'desktop.libsignalNet.grpc.AccountsAnonymousCheckAccountExistence', 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameHash.beta', 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameHash', + 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameLink.beta', + 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameLink', 'desktop.libsignalNet.useH2ForUnauthChat.beta', 'desktop.libsignalNet.useH2ForUnauthChat', ] as const; From 442bdb7e0290abc6ec70e75e266971fd685898d0 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:52:52 -0600 Subject: [PATCH 05/54] Update types for message.errors Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com> --- ts/messages/migrateLegacySendAttributes.preload.ts | 2 +- ts/model-types.d.ts | 2 +- ts/services/backups/export.preload.ts | 2 +- ts/sql/Server.node.ts | 2 +- ts/state/ducks/lightbox.preload.ts | 4 ++-- ts/state/ducks/mediaGallery.preload.ts | 2 +- ts/state/selectors/message.preload.ts | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ts/messages/migrateLegacySendAttributes.preload.ts b/ts/messages/migrateLegacySendAttributes.preload.ts index 5d48ffe89..8c9e080e9 100644 --- a/ts/messages/migrateLegacySendAttributes.preload.ts +++ b/ts/messages/migrateLegacySendAttributes.preload.ts @@ -140,7 +140,7 @@ export function migrateLegacySendAttributes( } function getConversationIdsFromErrors( - errors: undefined | ReadonlyArray, + errors: undefined | null | ReadonlyArray, getConversation: GetConversationType ): Array { const result: Array = []; diff --git a/ts/model-types.d.ts b/ts/model-types.d.ts index 97f1f00a9..7643cf44c 100644 --- a/ts/model-types.d.ts +++ b/ts/model-types.d.ts @@ -195,7 +195,7 @@ export type MessageAttributesType = { decrypted_at?: number; deletedForEveryone?: boolean; deletedForEveryoneTimestamp?: number; - errors?: ReadonlyArray; + errors?: ReadonlyArray | null; expirationStartTimestamp?: number | null; expireTimer?: DurationInSeconds; groupMigration?: GroupMigrationType; diff --git a/ts/services/backups/export.preload.ts b/ts/services/backups/export.preload.ts index b002167cc..88ed6bb0d 100644 --- a/ts/services/backups/export.preload.ts +++ b/ts/services/backups/export.preload.ts @@ -2979,7 +2979,7 @@ export class BackupExportStream extends Readable { ): Backups.ChatItem.IOutgoingMessageDetails { const sealedSenderServiceIds = new Set(unidentifiedDeliveries); const errorMap = new Map( - errors.map(({ serviceId, name }) => { + errors?.map(({ serviceId, name }) => { return [serviceId, name]; }) ); diff --git a/ts/sql/Server.node.ts b/ts/sql/Server.node.ts index 76947c402..82c04bf15 100644 --- a/ts/sql/Server.node.ts +++ b/ts/sql/Server.node.ts @@ -5824,7 +5824,7 @@ function getSortedNonAttachmentMedia( receivedAt: row.received_at, receivedAtMs: row.received_at_ms ?? undefined, sentAt: row.sent_at, - errors: row.errors, + errors: dropNull(row.errors), sendStateByConversationId: row.sendStateByConversationId, readStatus: row.readStatus, isErased: !!row.isErased, diff --git a/ts/state/ducks/lightbox.preload.ts b/ts/state/ducks/lightbox.preload.ts index 27a9705ec..7c6f51642 100644 --- a/ts/state/ducks/lightbox.preload.ts +++ b/ts/state/ducks/lightbox.preload.ts @@ -233,7 +233,7 @@ function showLightboxForViewOnceMedia( isErased: !!message.get('isErased'), readStatus: message.get('readStatus'), sendStateByConversationId: message.get('sendStateByConversationId'), - errors: message.get('errors'), + errors: message.get('errors') ?? undefined, }, }, ]; @@ -340,7 +340,7 @@ function showLightbox(opts: { sourceServiceId: message.get('sourceServiceId'), sentAt, isErased: !!message.get('isErased'), - errors: message.get('errors'), + errors: message.get('errors') ?? undefined, readStatus: message.get('readStatus'), sendStateByConversationId: message.get('sendStateByConversationId'), }, diff --git a/ts/state/ducks/mediaGallery.preload.ts b/ts/state/ducks/mediaGallery.preload.ts index 3e789d7d3..1e619afdf 100644 --- a/ts/state/ducks/mediaGallery.preload.ts +++ b/ts/state/ducks/mediaGallery.preload.ts @@ -237,7 +237,7 @@ function _cleanMessage( receivedAtMs: message.received_at_ms, sentAt: message.sent_at, isErased: !!message.isErased, - errors: message.errors, + errors: message.errors ?? undefined, readStatus: message.readStatus, sendStateByConversationId: message.sendStateByConversationId, }; diff --git a/ts/state/selectors/message.preload.ts b/ts/state/selectors/message.preload.ts index b9100c802..a5331740f 100644 --- a/ts/state/selectors/message.preload.ts +++ b/ts/state/selectors/message.preload.ts @@ -2498,7 +2498,7 @@ export const getMessageDetailsSelector = createSelector( } const { - errors: messageErrors = [], + errors: messageErrors, sendStateByConversationId = {}, unidentifiedDeliveries = [], unidentifiedDeliveryReceived, @@ -2549,7 +2549,7 @@ export const getMessageDetailsSelector = createSelector( } // This will make the error message for outgoing key errors a bit nicer - const allErrors = messageErrors.map(error => { + const allErrors = (messageErrors ?? []).map(error => { if (error.name === OUTGOING_KEY_ERROR) { return { ...error, From de600d5d5cb71d7e3c31271cb0cd411deac80c57 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Fri, 27 Feb 2026 08:45:44 -0600 Subject: [PATCH 06/54] Member Labels: A few small changes Co-authored-by: Scott Nonnenberg --- stylesheets/components/ConversationDetails.scss | 3 +++ ts/components/GroupMemberLabelInfoModal.dom.tsx | 4 ++-- ts/state/smart/ConversationPanel.preload.tsx | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stylesheets/components/ConversationDetails.scss b/stylesheets/components/ConversationDetails.scss index 4634045d1..602a68bac 100644 --- a/stylesheets/components/ConversationDetails.scss +++ b/stylesheets/components/ConversationDetails.scss @@ -61,6 +61,9 @@ ); } } + + margin-inline-start: -5px; + padding-inline-start: 5px; font-weight: 500; outline: none; border-radius: 5px; diff --git a/ts/components/GroupMemberLabelInfoModal.dom.tsx b/ts/components/GroupMemberLabelInfoModal.dom.tsx index 309cf85fe..327dfd6bf 100644 --- a/ts/components/GroupMemberLabelInfoModal.dom.tsx +++ b/ts/components/GroupMemberLabelInfoModal.dom.tsx @@ -40,9 +40,9 @@ export function GroupMemberLabelInfoModal(props: PropsType): JSX.Element { /> diff --git a/ts/state/smart/ConversationPanel.preload.tsx b/ts/state/smart/ConversationPanel.preload.tsx index 3ac93e995..ea6c7ad88 100644 --- a/ts/state/smart/ConversationPanel.preload.tsx +++ b/ts/state/smart/ConversationPanel.preload.tsx @@ -316,6 +316,10 @@ const PanelContainer = forwardRef< return; } + if (panel.type === PanelType.GroupMemberLabelEditor) { + return; + } + const focusNode = focusRef.current; if (!focusNode) { return; From dd34c102328d97adcc8e0a69383199acb3012d38 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Fri, 27 Feb 2026 13:04:18 -0600 Subject: [PATCH 07/54] AppImage updater: Add minGlibcVersion check Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com> --- package.json | 5 ++++ ts/updater/common.main.ts | 51 ++++++++++++++++++-------------- ts/updater/linuxAppImage.main.ts | 48 ++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index f139c1a6b..fa2fa6117 100644 --- a/package.json +++ b/package.json @@ -536,6 +536,11 @@ "url": "" } ], + "releaseInfo": { + "vendor": { + "minGlibcVersion": "2.31" + } + }, "extraResources": [ { "from": "build", diff --git a/ts/updater/common.main.ts b/ts/updater/common.main.ts index b600022f6..366d77b30 100644 --- a/ts/updater/common.main.ts +++ b/ts/updater/common.main.ts @@ -69,7 +69,8 @@ const { throttle } = lodash; const POLL_INTERVAL = 30 * durations.MINUTE; -type JSONVendorSchema = { +export type JSONVendorSchema = { + minGlibcVersion?: string; minOSVersion?: string; requireManualUpdate?: 'true' | 'false'; requireUserConfirmation?: 'true' | 'false'; @@ -244,6 +245,31 @@ export abstract class Updater { ipcMain.handleOnce('start-update', performUpdateCallback); } + protected checkSystemRequirements(vendor: JSONVendorSchema): boolean { + if (vendor.requireManualUpdate === 'true') { + this.logger.warn('checkSystemRequirements: manual update required'); + this.markCannotUpdate( + new Error('yaml file has requireManualUpdate flag'), + DialogType.Cannot_Update_Require_Manual + ); + return false; + } + + if (vendor.minOSVersion && lt(osRelease(), vendor.minOSVersion)) { + this.logger.warn( + `checkSystemRequirements: OS version ${osRelease()} is less than the ` + + `minimum supported version ${vendor.minOSVersion}` + ); + this.markCannotUpdate( + new Error('yaml file has unsatisfied minOSVersion value'), + DialogType.UnsupportedOS + ); + return false; + } + + return true; + } + protected markCannotUpdate( error: Error, dialogType = DialogType.Cannot_Update @@ -563,27 +589,8 @@ export abstract class Updater { const parsedYaml = parseYaml(yaml); const { vendor } = parsedYaml; - if (vendor) { - if (vendor.requireManualUpdate === 'true') { - this.logger.warn('checkForUpdates: manual update required'); - this.markCannotUpdate( - new Error('yaml file has requireManualUpdate flag'), - DialogType.Cannot_Update_Require_Manual - ); - return; - } - - if (vendor.minOSVersion && lt(osRelease(), vendor.minOSVersion)) { - this.logger.warn( - `checkForUpdates: OS version ${osRelease()} is less than the ` + - `minimum supported version ${vendor.minOSVersion}` - ); - this.markCannotUpdate( - new Error('yaml file has unsatisfied minOSVersion value'), - DialogType.UnsupportedOS - ); - return; - } + if (vendor && !this.checkSystemRequirements(vendor)) { + return; } const version = getVersion(parsedYaml); diff --git a/ts/updater/linuxAppImage.main.ts b/ts/updater/linuxAppImage.main.ts index 4ed8c8695..78df7d289 100644 --- a/ts/updater/linuxAppImage.main.ts +++ b/ts/updater/linuxAppImage.main.ts @@ -6,10 +6,13 @@ import { chmod } from 'fs-extra'; import config from 'config'; import { app } from 'electron'; +import { coerce, lt } from 'semver'; +import type { JSONVendorSchema } from './common.main.js'; import { Updater } from './common.main.js'; import { appRelaunch } from '../util/relaunch.main.js'; import { hexToBinary } from './signature.node.js'; +import { DialogType } from '../types/Dialogs.std.js'; export class LinuxAppImageUpdater extends Updater { #installing = false; @@ -71,4 +74,49 @@ export class LinuxAppImageUpdater extends Updater { await copyFile(updateFilePath, appImageFile); await chmod(appImageFile, 0o700); } + + override checkSystemRequirements(vendor: JSONVendorSchema): boolean { + const { minGlibcVersion } = vendor; + if (minGlibcVersion) { + const parsedMinGlibcVersion = coerce(minGlibcVersion); + if (!parsedMinGlibcVersion) { + this.logger.warn( + 'checkSystemRequirements: yaml had unparseable minGlibcVersion, ignoring. ' + + `yaml value: ${minGlibcVersion}` + ); + return true; + } + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const sysReport = process.report.getReport() as any; + const glibcVersion = sysReport?.header?.glibcVersionRuntime; + const parsedGlibcVersion = glibcVersion ? coerce(glibcVersion) : null; + if (!parsedGlibcVersion) { + this.logger.warn( + 'checkSystemRequirements: yaml had minGlibcVersion but unable to' + + 'get OS glibc version from system report, blocking update. ' + + `system value: ${glibcVersion}` + ); + this.markCannotUpdate( + new Error('system glibc version missing or unparseable'), + DialogType.UnsupportedOS + ); + return false; + } + + if (lt(parsedGlibcVersion, parsedMinGlibcVersion)) { + this.logger.warn( + `checkSystemRequirements: OS glibc ${glibcVersion} is less than the ` + + `minimum supported version ${minGlibcVersion}` + ); + this.markCannotUpdate( + new Error('yaml file has unsatisfied minGlibcVersion value'), + DialogType.UnsupportedOS + ); + return false; + } + } + + return true; + } } From 943aca830628f9b725fb22edc3a7d50b41b19d45 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Fri, 27 Feb 2026 13:04:26 -0600 Subject: [PATCH 08/54] Send remote mute requests in group calls and call links Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com> --- _locales/en/messages.json | 12 ++++ stylesheets/components/ContactModal.scss | 4 ++ .../CallLinkPendingParticipantModal.dom.tsx | 2 +- ts/components/CallManager.dom.tsx | 3 +- ts/components/CallingAdhocCallInfo.dom.tsx | 11 ++-- ts/components/CallingParticipantsList.dom.tsx | 13 +++-- ts/components/GlobalModalContainer.dom.tsx | 6 +- ts/components/StoryViewer.dom.tsx | 3 +- ts/components/StoryViewsNRepliesModal.dom.tsx | 5 +- .../conversation/ContactModal.dom.stories.tsx | 20 +++++++ .../conversation/ContactModal.dom.tsx | 58 +++++++++++++++++-- .../ContactSpoofingReviewDialog.dom.tsx | 9 ++- .../conversation/ConversationHero.dom.tsx | 2 +- ts/components/conversation/Message.dom.tsx | 5 +- .../conversation/TypingBubble.dom.tsx | 7 ++- .../ConversationDetails.dom.tsx | 4 +- .../ConversationDetailsHeader.dom.tsx | 2 +- .../ConversationDetailsMembershipList.dom.tsx | 7 ++- ts/services/calling.preload.ts | 9 +++ ts/state/ducks/calling.preload.ts | 23 ++++++++ ts/state/ducks/globalModals.preload.ts | 20 ++++--- ts/state/selectors/calling.std.ts | 20 +++++++ ts/state/smart/ContactModal.preload.tsx | 15 ++++- ts/state/smart/ContactName.preload.tsx | 6 +- ts/types/globalModals.std.ts | 8 +++ 25 files changed, 226 insertions(+), 48 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 97f9e5a22..672ad5c2b 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -6200,6 +6200,18 @@ "messageformat": "Voice", "description": "Text for button to start a new voice call in the Contact Details modal" }, + "icu:ContactModal--mute-audio": { + "messageformat": "Mute audio", + "description": "Button text to mute another call participant's audio from the Contact Details modal when in a group or call link call" + }, + "icu:ContactModal--confirm-mute-body": { + "messageformat": "Are you sure you want to mute {contact}?", + "description": "Confirm dialog body when muting another call participant's audio from the Contact Details modal in a group or call link call" + }, + "icu:ContactModal--confirm-mute-primary-button": { + "messageformat": "Mute", + "description": "Confirm dialog primary button text when muting another call participant's audio from the Contact Details modal in a group or call link call" + }, "icu:GroupMemberLabelInfoModal--title": { "messageformat": "Member labels", "description": "Title of explainer dialog you see when clicking member label in Contact Modal" diff --git a/stylesheets/components/ContactModal.scss b/stylesheets/components/ContactModal.scss index c5dfac3c0..f12c4024c 100644 --- a/stylesheets/components/ContactModal.scss +++ b/stylesheets/components/ContactModal.scss @@ -126,6 +126,10 @@ background-color: variables.$color-gray-80; } } + + &[disabled] { + opacity: 0.5; + } } &__bubble-icon { diff --git a/ts/components/CallLinkPendingParticipantModal.dom.tsx b/ts/components/CallLinkPendingParticipantModal.dom.tsx index 5715fb314..0306cc2b7 100644 --- a/ts/components/CallLinkPendingParticipantModal.dom.tsx +++ b/ts/components/CallLinkPendingParticipantModal.dom.tsx @@ -13,7 +13,7 @@ import { ThemeType } from '../types/Util.std.js'; import { Theme } from '../util/theme.std.js'; import { UserText } from './UserText.dom.js'; import { SharedGroupNames } from './SharedGroupNames.dom.js'; -import type { ContactModalStateType } from '../state/ducks/globalModals.preload.js'; +import type { ContactModalStateType } from '../types/globalModals.std.js'; export type CallLinkPendingParticipantModalProps = { readonly i18n: LocalizerType; diff --git a/ts/components/CallManager.dom.tsx b/ts/components/CallManager.dom.tsx index 9e1f19c54..d4af8cfd4 100644 --- a/ts/components/CallManager.dom.tsx +++ b/ts/components/CallManager.dom.tsx @@ -60,6 +60,7 @@ import { import type { NotificationProfileType } from '../types/NotificationProfile.std.js'; import { strictAssert } from '../util/assert.std.js'; import type { SetLocalPreviewContainerType } from '../services/calling.preload.js'; +import type { ContactModalStateType } from '../types/globalModals.std.js'; const { noop } = lodash; @@ -107,7 +108,7 @@ export type PropsType = { renderReactionPicker: ( props: React.ComponentProps ) => React.JSX.Element; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; startCall: (payload: StartCallType) => void; toggleParticipants: () => void; acceptCall: (_: AcceptCallType) => void; diff --git a/ts/components/CallingAdhocCallInfo.dom.tsx b/ts/components/CallingAdhocCallInfo.dom.tsx index bc97915f6..983a2d68a 100644 --- a/ts/components/CallingAdhocCallInfo.dom.tsx +++ b/ts/components/CallingAdhocCallInfo.dom.tsx @@ -21,6 +21,7 @@ import { Button } from './Button.dom.js'; import { Modal } from './Modal.dom.js'; import { Theme } from '../util/theme.std.js'; import { ConfirmationDialog } from './ConfirmationDialog.dom.js'; +import type { ContactModalStateType } from '../types/globalModals.std.js'; const { partition } = lodash; @@ -46,10 +47,7 @@ export type PropsType = { readonly onShareCallLinkViaSignal: () => void; readonly removeClient: (payload: RemoveClientType) => void; readonly blockClient: (payload: RemoveClientType) => void; - readonly showContactModal: ( - contactId: string, - conversationId?: string - ) => void; + readonly showContactModal: (payload: ContactModalStateType) => void; }; type UnknownContactsPropsType = { @@ -204,7 +202,10 @@ export function CallingAdhocCallInfo({ } onClose(); - showContactModal(participant.id); + showContactModal({ + activeCallDemuxId: participant.demuxId, + contactId: participant.id, + }); }} type="button" > diff --git a/ts/components/CallingParticipantsList.dom.tsx b/ts/components/CallingParticipantsList.dom.tsx index e7073cda4..07040cd23 100644 --- a/ts/components/CallingParticipantsList.dom.tsx +++ b/ts/components/CallingParticipantsList.dom.tsx @@ -16,12 +16,14 @@ import { sortByTitle } from '../util/sortByTitle.std.js'; import type { ConversationType } from '../state/ducks/conversations.preload.js'; import { isInSystemContacts } from '../util/isInSystemContacts.std.js'; import { ModalContainerContext } from './ModalHost.dom.js'; +import type { ContactModalStateType } from '../types/globalModals.std.js'; type ParticipantType = ConversationType & { hasRemoteAudio?: boolean; hasRemoteVideo?: boolean; isHandRaised?: boolean; presenting?: boolean; + demuxId?: number; }; export type PropsType = { @@ -30,10 +32,7 @@ export type PropsType = { readonly onClose: () => void; readonly ourServiceId: ServiceIdString | undefined; readonly participants: Array; - readonly showContactModal: ( - contactId: string, - conversationId?: string - ) => void; + readonly showContactModal: (payload: ContactModalStateType) => void; }; export const CallingParticipantsList = React.memo( @@ -119,7 +118,11 @@ export const CallingParticipantsList = React.memo( } onClose(); - showContactModal(participant.id, conversationId); + showContactModal({ + activeCallDemuxId: participant.demuxId, + contactId: participant.id, + conversationId, + }); }} type="button" > diff --git a/ts/components/GlobalModalContainer.dom.tsx b/ts/components/GlobalModalContainer.dom.tsx index 108de4927..bceb4bbaf 100644 --- a/ts/components/GlobalModalContainer.dom.tsx +++ b/ts/components/GlobalModalContainer.dom.tsx @@ -4,7 +4,6 @@ import React from 'react'; import type { CallQualitySurveyPropsType, - ContactModalStateType, DeleteMessagesPropsType, EditHistoryMessagesType, EditNicknameAndNoteModalPropsType, @@ -15,7 +14,10 @@ import type { UserNotFoundModalStateType, } from '../state/ducks/globalModals.preload.js'; import type { LocalizerType, ThemeType } from '../types/Util.std.js'; -import { UsernameOnboardingState } from '../types/globalModals.std.js'; +import { + type ContactModalStateType, + UsernameOnboardingState, +} from '../types/globalModals.std.js'; import { missingCaseError } from '../util/missingCaseError.std.js'; import { ButtonVariant } from './Button.dom.js'; diff --git a/ts/components/StoryViewer.dom.tsx b/ts/components/StoryViewer.dom.tsx index e50e6c7af..1f3ebfaa6 100644 --- a/ts/components/StoryViewer.dom.tsx +++ b/ts/components/StoryViewer.dom.tsx @@ -53,6 +53,7 @@ import { arrow } from '../util/keyboard.dom.js'; import { StoryProgressSegment } from './StoryProgressSegment.dom.js'; import type { EmojiSkinTone } from './fun/data/emojis.std.js'; import type { FunEmojiSelection } from './fun/panels/FunPanelEmojis.dom.js'; +import type { ContactModalStateType } from '../types/globalModals.std.js'; const log = createLogger('StoryViewer'); @@ -110,7 +111,7 @@ export type PropsType = { retryMessageSend: (messageId: string) => unknown; saveAttachment: SaveAttachmentActionCreatorType; setHasAllStoriesUnmuted: (isUnmuted: boolean) => unknown; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; showToast: ShowToastAction; emojiSkinToneDefault: EmojiSkinTone | null; story: StoryViewType; diff --git a/ts/components/StoryViewsNRepliesModal.dom.tsx b/ts/components/StoryViewsNRepliesModal.dom.tsx index 3d926c313..26ba0b823 100644 --- a/ts/components/StoryViewsNRepliesModal.dom.tsx +++ b/ts/components/StoryViewsNRepliesModal.dom.tsx @@ -45,6 +45,7 @@ import { useConfirmDiscard } from '../hooks/useConfirmDiscard.dom.js'; import { AxoContextMenu } from '../axo/AxoContextMenu.dom.js'; import type { AxoMenuBuilder } from '../axo/AxoMenuBuilder.dom.js'; import { drop } from '../util/drop.std.js'; +import type { ContactModalStateType } from '../types/globalModals.std.js'; const { noop, orderBy } = lodash; @@ -124,7 +125,7 @@ export type PropsType = { ourConversationId: string | undefined; preferredReactionEmoji: ReadonlyArray; replies: ReadonlyArray; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; emojiSkinToneDefault: EmojiSkinTone | null; sortedGroupMembers?: ReadonlyArray; views: ReadonlyArray; @@ -545,7 +546,7 @@ type ReplyOrReactionMessageProps = { reply: ReplyType; shouldCollapseAbove: boolean; shouldCollapseBelow: boolean; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; messageExpanded: (messageId: string, displayLimit: number) => void; showSpoiler: (messageId: string, data: Record) => void; }; diff --git a/ts/components/conversation/ContactModal.dom.stories.tsx b/ts/components/conversation/ContactModal.dom.stories.tsx index e90a13a21..ad763c59a 100644 --- a/ts/components/conversation/ContactModal.dom.stories.tsx +++ b/ts/components/conversation/ContactModal.dom.stories.tsx @@ -37,6 +37,7 @@ export default { }, args: { i18n, + activeCallDemuxId: undefined, areWeASubscriber: false, areWeAdmin: false, badges: [], @@ -51,6 +52,8 @@ export default { hideContactModal: action('hideContactModal'), isAdmin: false, isMember: true, + isMuted: false, + isRemoteMuteVisible: false, onOutgoingAudioCallInConversation: action( 'onOutgoingAudioCallInConversation' ), @@ -58,6 +61,7 @@ export default { 'onOutgoingVideoCallInConversation' ), removeMemberFromGroup: action('removeMemberFromGroup'), + sendRemoteMute: action('sendRemoteMute'), showConversation: action('showConversation'), startAvatarDownload: action('startAvatarDownload'), theme: ThemeType.light, @@ -188,3 +192,19 @@ export const InAnotherCall = Template.bind({}); InAnotherCall.args = { hasActiveCall: true, }; + +export const InCallTogether = Template.bind({}); +InCallTogether.args = { + activeCallDemuxId: 123, + hasActiveCall: true, + isMuted: false, + isRemoteMuteVisible: true, +}; + +export const InCallTogetherMuted = Template.bind({}); +InCallTogetherMuted.args = { + activeCallDemuxId: 123, + hasActiveCall: true, + isMuted: true, + isRemoteMuteVisible: true, +}; diff --git a/ts/components/conversation/ContactModal.dom.tsx b/ts/components/conversation/ContactModal.dom.tsx index ee2e32006..482137354 100644 --- a/ts/components/conversation/ContactModal.dom.tsx +++ b/ts/components/conversation/ContactModal.dom.tsx @@ -31,18 +31,20 @@ import { InAnotherCallTooltip, getTooltipContent, } from './InAnotherCallTooltip.dom.js'; -import type { - ContactModalStateType, - ToggleGroupMemberLabelInfoModalType, -} from '../../state/ducks/globalModals.preload.js'; +import type { ToggleGroupMemberLabelInfoModalType } from '../../state/ducks/globalModals.preload.js'; +import type { ContactModalStateType } from '../../types/globalModals.std.js'; import { GroupMemberLabel } from './ContactName.dom.js'; import { SignalService as Proto } from '../../protobuf/index.std.js'; +import { AxoSymbol } from '../../axo/AxoSymbol.dom.js'; +import { tw } from '../../axo/tw.dom.js'; +import { strictAssert } from '../../util/assert.std.js'; const ACCESS_ENUM = Proto.AccessControl.AccessRequired; const log = createLogger('ContactModal'); export type PropsDataType = { + activeCallDemuxId?: number; areWeASubscriber: boolean; areWeAdmin: boolean; badges: ReadonlyArray; @@ -55,6 +57,8 @@ export type PropsDataType = { readonly i18n: LocalizerType; isAdmin: boolean; isMember: boolean; + isMuted: boolean; + isRemoteMuteVisible: boolean; theme: ThemeType; hasActiveCall: boolean; isInFullScreenCall: boolean; @@ -67,6 +71,7 @@ type PropsActionType = { onOutgoingAudioCallInConversation: (conversationId: string) => unknown; onOutgoingVideoCallInConversation: (conversationId: string) => unknown; removeMemberFromGroup: (conversationId: string, contactId: string) => void; + sendRemoteMute: (demuxId: number) => void; showConversation: ShowConversationType; startAvatarDownload: () => void; toggleAboutContactModal: (options: ContactModalStateType) => unknown; @@ -91,9 +96,11 @@ enum SubModalState { ToggleAdmin = 'ToggleAdmin', MemberRemove = 'MemberRemove', ConfirmingBlock = 'ConfirmingBlock', + ConfirmingMute = 'ConfirmingMute', } export function ContactModal({ + activeCallDemuxId, areWeAdmin, areWeASubscriber, badges, @@ -110,10 +117,13 @@ export function ContactModal({ i18n, isAdmin, isMember, + isMuted, + isRemoteMuteVisible, onOpenEditNicknameAndNoteModal, onOutgoingAudioCallInConversation, onOutgoingVideoCallInConversation, removeMemberFromGroup, + sendRemoteMute, showConversation, startAvatarDownload, theme, @@ -326,6 +336,33 @@ export function ContactModal({ ); break; + case SubModalState.ConfirmingMute: + modalNode = ( + { + strictAssert( + activeCallDemuxId != null, + 'activeCallDemuxId must exist' + ); + hideContactModal(); + sendRemoteMute(activeCallDemuxId); + }, + style: 'affirmative', + }, + ]} + i18n={i18n} + onClose={() => setSubModalState(SubModalState.None)} + > + {i18n('icu:ContactModal--confirm-mute-body', { + contact: contact.title, + })} + + ); + break; default: { const state: never = subModalState; log.warn(`unexpected ${state}!`); @@ -530,6 +567,19 @@ export function ContactModal({ )} + {isRemoteMuteVisible && ( + + )} {modalNode} diff --git a/ts/components/conversation/ContactSpoofingReviewDialog.dom.tsx b/ts/components/conversation/ContactSpoofingReviewDialog.dom.tsx index f93e693f5..851ce21bb 100644 --- a/ts/components/conversation/ContactSpoofingReviewDialog.dom.tsx +++ b/ts/components/conversation/ContactSpoofingReviewDialog.dom.tsx @@ -20,6 +20,7 @@ import { Button, ButtonVariant } from '../Button.dom.js'; import { assertDev } from '../../util/assert.std.js'; import { missingCaseError } from '../../util/missingCaseError.std.js'; import { isInSystemContacts } from '../../util/isInSystemContacts.std.js'; +import type { ContactModalStateType } from '../../types/globalModals.std.js'; export type ReviewPropsType = Readonly< | { @@ -61,7 +62,7 @@ export type PropsType = { getPreferredBadge: PreferredBadgeSelectorType; i18n: LocalizerType; onClose: () => void; - showContactModal: (contactId: string, conversationId?: string) => unknown; + showContactModal: (payload: ContactModalStateType) => unknown; removeMember: ( conversationId: string, memberConversationId: string @@ -253,7 +254,7 @@ export function ContactSpoofingReviewDialog( sharedGroupNames={safe.sharedGroupNames} i18n={i18n} onClick={() => { - showContactModal(safe.conversation.id); + showContactModal({ contactId: safe.conversation.id }); }} theme={theme} isSignalConnection={safe.isSignalConnection} @@ -350,7 +351,9 @@ export function ContactSpoofingReviewDialog( theme={theme} oldName={oldName} onClick={() => { - showContactModal(conversationInfo.conversation.id); + showContactModal({ + contactId: conversationInfo.conversation.id, + }); }} isSignalConnection={isSignalConnection} > diff --git a/ts/components/conversation/ConversationHero.dom.tsx b/ts/components/conversation/ConversationHero.dom.tsx index 888bc1162..ac0452b47 100644 --- a/ts/components/conversation/ConversationHero.dom.tsx +++ b/ts/components/conversation/ConversationHero.dom.tsx @@ -18,7 +18,7 @@ import { StoryViewModeType } from '../../types/Stories.std.js'; import { Button, ButtonVariant } from '../Button.dom.js'; import { SafetyTipsModal } from '../SafetyTipsModal.dom.js'; import { I18n } from '../I18n.dom.js'; -import type { ContactModalStateType } from '../../state/ducks/globalModals.preload.js'; +import type { ContactModalStateType } from '../../types/globalModals.std.js'; export type Props = { about?: string; diff --git a/ts/components/conversation/Message.dom.tsx b/ts/components/conversation/Message.dom.tsx index f4681c849..2e5fd507b 100644 --- a/ts/components/conversation/Message.dom.tsx +++ b/ts/components/conversation/Message.dom.tsx @@ -127,6 +127,7 @@ import { useGroupedAndOrderedReactions } from '../../util/groupAndOrderReactions import type { AxoMenuBuilder } from '../../axo/AxoMenuBuilder.dom.js'; import type { RenderAudioAttachmentProps } from '../../state/smart/renderAudioAttachment.preload.js'; import type { MemberLabelType } from '../../types/GroupMemberLabels.std.js'; +import type { ContactModalStateType } from '../../types/globalModals.std.js'; const { drop, take, unescape } = lodash; @@ -391,7 +392,7 @@ export type PropsActions = { optionIndexes: ReadonlyArray; }) => void; endPoll: (messageId: string) => void; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; showSpoiler: (messageId: string, data: Record) => void; cancelAttachmentDownload: (options: { messageId: string }) => void; @@ -2330,7 +2331,7 @@ export class Message extends React.PureComponent { event.stopPropagation(); event.preventDefault(); - showContactModal(author.id, conversationId); + showContactModal({ contactId: author.id, conversationId }); }} phoneNumber={author.phoneNumber} profileName={author.profileName} diff --git a/ts/components/conversation/TypingBubble.dom.tsx b/ts/components/conversation/TypingBubble.dom.tsx index b97d37403..cb752e6e2 100644 --- a/ts/components/conversation/TypingBubble.dom.tsx +++ b/ts/components/conversation/TypingBubble.dom.tsx @@ -14,6 +14,7 @@ import type { ConversationType } from '../../state/ducks/conversations.preload.j import type { PreferredBadgeSelectorType } from '../../state/selectors/badges.preload.js'; import { drop } from '../../util/drop.std.js'; import { useReducedMotion } from '../../hooks/useReducedMotion.dom.js'; +import type { ContactModalStateType } from '../../types/globalModals.std.js'; const MAX_AVATARS_COUNT = 3; @@ -38,7 +39,7 @@ export type TypingBubblePropsType = { lastItemTimestamp: number | undefined; getConversation: (id: string) => ConversationType; getPreferredBadge: PreferredBadgeSelectorType; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; i18n: LocalizerType; theme: ThemeType; }; @@ -83,7 +84,7 @@ function TypingBubbleAvatar({ shouldAnimate: boolean; getPreferredBadge: PreferredBadgeSelectorType; onContactExit: (id: string | undefined) => void; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; i18n: LocalizerType; theme: ThemeType; }): ReactElement | null { @@ -130,7 +131,7 @@ function TypingBubbleAvatar({ onClick={event => { event.stopPropagation(); event.preventDefault(); - showContactModal(contact.id, conversationId); + showContactModal({ contactId: contact.id, conversationId }); }} phoneNumber={contact.phoneNumber} profileName={contact.profileName} diff --git a/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx b/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx index b4c71768e..cc8fbe326 100644 --- a/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx @@ -65,7 +65,7 @@ import { getTooltipContent, } from '../InAnotherCallTooltip.dom.js'; import { BadgeSustainerInstructionsDialog } from '../../BadgeSustainerInstructionsDialog.dom.js'; -import type { ContactModalStateType } from '../../../state/ducks/globalModals.preload.js'; +import type { ContactModalStateType } from '../../../types/globalModals.std.js'; import type { ShowToastAction } from '../../../state/ducks/toast.preload.js'; import { ToastType } from '../../../types/Toast.dom.js'; @@ -142,7 +142,7 @@ type ActionProps = { searchInConversation: (id: string) => unknown; setDisappearingMessages: (id: string, seconds: DurationInSeconds) => void; setMuteExpiration: (id: string, muteExpiresAt: undefined | number) => unknown; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; showConversation: ShowConversationType; toggleAboutContactModal: (options: ContactModalStateType) => void; toggleAddUserToAnotherGroupModal: (contactId?: string) => void; diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.dom.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.dom.tsx index 2d7be8706..f9bab8b3e 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsHeader.dom.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsHeader.dom.tsx @@ -16,7 +16,7 @@ import type { BadgeType } from '../../../badges/types.std.js'; import { UserText } from '../../UserText.dom.js'; import { isInSystemContacts } from '../../../util/isInSystemContacts.std.js'; import { InContactsIcon } from '../../InContactsIcon.dom.js'; -import type { ContactModalStateType } from '../../../state/ducks/globalModals.preload.js'; +import type { ContactModalStateType } from '../../../types/globalModals.std.js'; export type Props = { areWeASubscriber: boolean; diff --git a/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.dom.tsx b/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.dom.tsx index c008a35da..6b1789a6d 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.dom.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.dom.tsx @@ -18,6 +18,7 @@ import { PanelRow } from './PanelRow.dom.js'; import { PanelSection } from './PanelSection.dom.js'; import { GroupMemberLabel } from '../ContactName.dom.js'; import { AriaClickable } from '../../../axo/AriaClickable.dom.js'; +import type { ContactModalStateType } from '../../../types/globalModals.std.js'; export type GroupV2Membership = { isAdmin: boolean; @@ -36,7 +37,7 @@ export type Props = { maxShownMemberCount?: number; memberships: ReadonlyArray; memberColors: Map; - showContactModal: (contactId: string, conversationId?: string) => void; + showContactModal: (payload: ContactModalStateType) => void; showLabelEditor: () => void; startAddingNewMembers?: () => void; theme: ThemeType; @@ -129,7 +130,9 @@ export function ConversationDetailsMembershipList({ return ( showContactModal(member.id, conversationId)} + onClick={() => + showContactModal({ contactId: member.id, conversationId }) + } icon={ { + return (dispatch, getState) => { + const state = getState(); + const activeCall = getActiveCall(state.calling); + if (!isGroupOrAdhocCallState(activeCall)) { + log.warn( + 'sendRemoteMute: Trying to remote mute without active group or adhoc call' + ); + return; + } + + calling.sendRemoteMute(activeCall.conversationId, demuxId); + dispatch({ + type: 'NOOP', + payload: null, + }); + }; +} + function callStateChange( payload: CallStateChangeType ): ThunkAction< @@ -3071,6 +3093,7 @@ export const actions = { returnToActiveCall, sendGroupCallRaiseHand, sendGroupCallReaction, + sendRemoteMute, selectPresentingSource, setGroupCallVideoRequest, setIsCallActive, diff --git a/ts/state/ducks/globalModals.preload.ts b/ts/state/ducks/globalModals.preload.ts index b97cc6a0f..895bec34f 100644 --- a/ts/state/ducks/globalModals.preload.ts +++ b/ts/state/ducks/globalModals.preload.ts @@ -22,6 +22,7 @@ import type { StateType as RootStateType } from '../reducer.preload.js'; import * as SingleServePromise from '../../services/singleServePromise.std.js'; import { isKeyTransparencyAvailable } from '../../services/keyTransparency.preload.js'; import * as Stickers from '../../types/Stickers.preload.js'; +import type { ContactModalStateType } from '../../types/globalModals.std.js'; import { UsernameOnboardingState } from '../../types/globalModals.std.js'; import { createLogger } from '../../logging/log.std.js'; import { @@ -257,11 +258,6 @@ const HIDE_LOW_DISK_SPACE_BACKUP_IMPORT_MODAL = 'globalModals/HIDE_LOW_DISK_SPACE_BACKUP_IMPORT_MODAL'; const TOGGLE_PIN_MESSAGE_DIALOG = 'globalModals/TOGGLE_PIN_MESSAGE_DIALOG'; -export type ContactModalStateType = ReadonlyDeep<{ - contactId: string; - conversationId?: string; -}>; - export type UserNotFoundModalStateType = ReadonlyDeep< | { type: 'phoneNumber'; @@ -738,13 +734,19 @@ function hideContactModal(): HideContactModalActionType { }; } -function showContactModal( - contactId: string, - conversationId?: string -): ShowContactModalActionType { +function showContactModal({ + activeCallDemuxId, + contactId, + conversationId, +}: { + contactId: string; + conversationId?: string; + activeCallDemuxId?: number; +}): ShowContactModalActionType { return { type: SHOW_CONTACT_MODAL, payload: { + activeCallDemuxId, contactId, conversationId, }, diff --git a/ts/state/selectors/calling.std.ts b/ts/state/selectors/calling.std.ts index 631e0e6d2..c210cd5a7 100644 --- a/ts/state/selectors/calling.std.ts +++ b/ts/state/selectors/calling.std.ts @@ -12,6 +12,7 @@ import type { DirectCallStateType, GroupCallStateType, ActiveCallStateType, + GroupCallParticipantInfoType, } from '../ducks/calling.preload.js'; import { getRingingCall as getRingingCallHelper } from '../ducks/callingHelpers.std.js'; import type { PresentedSource } from '../../types/Calling.std.js'; @@ -23,6 +24,7 @@ import { import { getUserACI } from './user.std.js'; import { getOwn } from '../../util/getOwn.std.js'; import type { AciString } from '../../types/ServiceId.std.js'; +import { isGroupOrAdhocCallState } from '../../util/isGroupOrAdhocCall.std.js'; export type CallStateType = DirectCallStateType | GroupCallStateType; @@ -183,3 +185,21 @@ export const getPresentingSource = createSelector( (activeCallState): PresentedSource | undefined => activeCallState?.presentingSource ); + +type ParticipantByDemuxIdInCallSelectorType = ( + demuxId: number | undefined +) => GroupCallParticipantInfoType | undefined; + +export const getParticipantInActiveCall = createSelector( + getActiveCall, + (call: CallStateType | undefined): ParticipantByDemuxIdInCallSelectorType => + (demuxId: number | undefined): GroupCallParticipantInfoType | undefined => { + if (demuxId == null || !isGroupOrAdhocCallState(call)) { + return undefined; + } + + return call.remoteParticipants.find( + participant => participant.demuxId === demuxId + ); + } +); diff --git a/ts/state/smart/ContactModal.preload.tsx b/ts/state/smart/ContactModal.preload.tsx index 44e084631..2de67e40b 100644 --- a/ts/state/smart/ContactModal.preload.tsx +++ b/ts/state/smart/ContactModal.preload.tsx @@ -15,6 +15,7 @@ import { getHasStoriesSelector } from '../selectors/stories2.dom.js'; import { getActiveCallState, isInFullScreenCall as getIsInFullScreenCall, + getParticipantInActiveCall, } from '../selectors/calling.std.js'; import { useStoriesActions } from '../ducks/stories.preload.js'; import { useConversationsActions } from '../ducks/conversations.preload.js'; @@ -26,11 +27,18 @@ import { strictAssert } from '../../util/assert.std.js'; export const SmartContactModal = memo(function SmartContactModal() { const i18n = useSelector(getIntl); const theme = useSelector(getTheme); - const { conversationId, contactId } = useSelector(getContactModalState) ?? {}; + const { conversationId, contactId, activeCallDemuxId } = + useSelector(getContactModalState) ?? {}; const conversationSelector = useSelector(getConversationSelector); const hasStoriesSelector = useSelector(getHasStoriesSelector); + const activeCallState = useSelector(getActiveCallState); const isInFullScreenCall = useSelector(getIsInFullScreenCall); + const getCallParticipant = useSelector(getParticipantInActiveCall); + const callParticipant = getCallParticipant(activeCallDemuxId); + const isRemoteMuteVisible = Boolean(callParticipant); + const isMuted = !callParticipant?.hasRemoteAudio; + const badgesSelector = useSelector(getBadgesSelector); const areWeASubscriber = useSelector(getAreWeASubscriber); @@ -78,6 +86,7 @@ export const SmartContactModal = memo(function SmartContactModal() { onOutgoingVideoCallInConversation, onOutgoingAudioCallInConversation, togglePip, + sendRemoteMute, } = useCallingActions(); const handleOpenEditNicknameAndNoteModal = useCallback(() => { @@ -103,10 +112,14 @@ export const SmartContactModal = memo(function SmartContactModal() { isAdmin={isAdmin} isInFullScreenCall={isInFullScreenCall} isMember={isMember} + isMuted={isMuted} + isRemoteMuteVisible={isRemoteMuteVisible} + activeCallDemuxId={activeCallDemuxId} onOpenEditNicknameAndNoteModal={handleOpenEditNicknameAndNoteModal} onOutgoingAudioCallInConversation={onOutgoingAudioCallInConversation} onOutgoingVideoCallInConversation={onOutgoingVideoCallInConversation} removeMemberFromGroup={removeMemberFromGroup} + sendRemoteMute={sendRemoteMute} showConversation={showConversation} startAvatarDownload={() => startAvatarDownload(contact.id)} theme={theme} diff --git a/ts/state/smart/ContactName.preload.tsx b/ts/state/smart/ContactName.preload.tsx index dae869156..7afcee98a 100644 --- a/ts/state/smart/ContactName.preload.tsx +++ b/ts/state/smart/ContactName.preload.tsx @@ -17,7 +17,7 @@ export const SmartContactName = memo(function SmartContactName({ }: ExternalProps) { const i18n = useSelector(getIntl); const getConversation = useSelector(getConversationSelector); - const currentConversationId = useSelector(getSelectedConversationId); + const conversationId = useSelector(getSelectedConversationId); const { showContactModal } = useGlobalModalActions(); @@ -26,8 +26,8 @@ export const SmartContactName = memo(function SmartContactName({ }, [getConversation, contactId]); const handleClick = useCallback(() => { - showContactModal(contactId, currentConversationId); - }, [showContactModal, contactId, currentConversationId]); + showContactModal({ contactId, conversationId }); + }, [showContactModal, contactId, conversationId]); return ( ; From 06bfe81372138e3c3dfc0591a73aacdbfca0322b Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Mon, 2 Mar 2026 12:23:58 -0600 Subject: [PATCH 09/54] Fix re-prompting to register as default client for protocols if we already are Signed-off-by: Alex Lowe Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com> Co-authored-by: Alex Lowe --- app/main.main.ts | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/app/main.main.ts b/app/main.main.ts index fe3a4b9a8..60097d453 100644 --- a/app/main.main.ts +++ b/app/main.main.ts @@ -2639,8 +2639,24 @@ app.on( } ); -app.setAsDefaultProtocolClient('sgnl'); -app.setAsDefaultProtocolClient('signalcaptcha'); +if (!app.isDefaultProtocolClient('sgnl')) { + log.info('setting signal as the default app for the sgnl url scheme'); + app.setAsDefaultProtocolClient('sgnl'); +} else { + log.info( + 'signal is already registered as the default app for the sgnl url scheme.' + ); +} +if (!app.isDefaultProtocolClient('signalcaptcha')) { + log.info( + 'setting signal as the default app for the signalcaptcha url scheme' + ); + app.setAsDefaultProtocolClient('signalcaptcha'); +} else { + log.info( + 'signal is already registered as the default app for the sgnl url scheme.' + ); +} ipc.on( 'set-badge', From 48b0d87a579373c55f5547875c7d0c277a2c5b3c Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Wed, 4 Mar 2026 10:07:13 -0600 Subject: [PATCH 10/54] Fix toast and megaphone overlay Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com> --- stylesheets/components/ToastManager.scss | 22 ++++++++++++---------- ts/components/ToastManager.dom.tsx | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/stylesheets/components/ToastManager.scss b/stylesheets/components/ToastManager.scss index 65b910b63..fc801a632 100644 --- a/stylesheets/components/ToastManager.scss +++ b/stylesheets/components/ToastManager.scss @@ -3,20 +3,21 @@ @use '../variables'; -.ToastManager { - display: flex; - flex-direction: column; - pointer-events: none; - - gap: 16px; - +.ToastManagerContainer { // Sync inner width with left pane position: fixed; width: inherit; bottom: 0; z-index: variables.$z-index-toast; + pointer-events: none; +} - padding: 16px; +.ToastManager { + display: flex; + flex-direction: column-reverse; + gap: 16px; + margin: 16px; + pointer-events: none; & * { pointer-events: auto; @@ -43,6 +44,7 @@ } .ToastManager--narrow-sidebar.ToastManager--composition-area-visible { + position: fixed; inset-inline-start: 0; width: 100%; align-items: center; @@ -56,9 +58,9 @@ } .ToastManager--megaphones { - padding: 12px; + margin: 12px; } .ToastManager--megaphones.ToastManager--narrow-sidebar { - padding: 10px; + margin: 10px; } diff --git a/ts/components/ToastManager.dom.tsx b/ts/components/ToastManager.dom.tsx index 833c35759..8179dceb4 100644 --- a/ts/components/ToastManager.dom.tsx +++ b/ts/components/ToastManager.dom.tsx @@ -1026,17 +1026,7 @@ export function ToastManager(props: PropsType): React.JSX.Element { const toast = renderToast(props); return ( - <> - {megaphone && ( -
- {renderMegaphone(props)} -
- )} +
- + {megaphone && ( +
+ {renderMegaphone(props)} +
+ )} +
); } From b7b2116fe2ee628fc3a7f7c7cd8870c9962ede7c Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Wed, 4 Mar 2026 10:07:23 -0600 Subject: [PATCH 11/54] Allow all group members to have labels, no permission required Co-authored-by: Scott Nonnenberg --- .../GroupMemberLabelEditor.dom.tsx | 46 --------------- .../GroupV2Permissions.dom.tsx | 57 ------------------- ts/groups.preload.ts | 56 ------------------ ts/types/GroupMemberLabels.std.ts | 9 +-- 4 files changed, 1 insertion(+), 167 deletions(-) diff --git a/ts/components/conversation/conversation-details/GroupMemberLabelEditor.dom.tsx b/ts/components/conversation/conversation-details/GroupMemberLabelEditor.dom.tsx index 7ceab345c..1129811ca 100644 --- a/ts/components/conversation/conversation-details/GroupMemberLabelEditor.dom.tsx +++ b/ts/components/conversation/conversation-details/GroupMemberLabelEditor.dom.tsx @@ -26,7 +26,6 @@ import { import { ConversationColors } from '../../../types/Colors.std.js'; import { WidthBreakpoint } from '../../_util.std.js'; import { AxoAlertDialog } from '../../../axo/AxoAlertDialog.dom.js'; -import { SignalService as Proto } from '../../../protobuf/index.std.js'; import { Avatar, AvatarSize } from '../../Avatar.dom.js'; import { UserText } from '../../UserText.dom.js'; import { GroupMemberLabel } from '../ContactName.dom.js'; @@ -105,8 +104,6 @@ export function GroupMemberLabelEditor({ }: PropsType): React.JSX.Element { const [isShowingGeneralError, setIsShowingGeneralError] = React.useState(false); - const [isShowingPermissionsError, setIsShowingPermissionsError] = - React.useState(false); const messageContainer = useRef(null); @@ -134,17 +131,6 @@ export function GroupMemberLabelEditor({ ? { labelEmoji, labelString: labelStringForSave } : undefined; - useEffect(() => { - if ( - !group.areWeAdmin && - group.accessControlAttributes === - Proto.AccessControl.AccessRequired.ADMINISTRATOR && - !isShowingPermissionsError - ) { - setIsShowingPermissionsError(true); - } - }, [group, isShowingPermissionsError, setIsShowingPermissionsError]); - const tryClose = React.useRef<() => void | undefined>(); const [confirmDiscardModal, confirmDiscardIf] = useConfirmDiscard({ i18n, @@ -438,38 +424,6 @@ export function GroupMemberLabelEditor({ - { - if (!value) { - setIsShowingPermissionsError(false); - popPanelForConversation(); - } - }} - > - - - - {i18n('icu:ConversationDetails--member-label--error-title')} - - - {i18n('icu:ConversationDetails--member-label--error-permissions')} - - - - { - popPanelForConversation(); - setIsShowingPermissionsError(false); - }} - > - {i18n('icu:ok')} - - - -
); } diff --git a/ts/components/conversation/conversation-details/GroupV2Permissions.dom.tsx b/ts/components/conversation/conversation-details/GroupV2Permissions.dom.tsx index 0990756a4..b4507ef15 100644 --- a/ts/components/conversation/conversation-details/GroupV2Permissions.dom.tsx +++ b/ts/components/conversation/conversation-details/GroupV2Permissions.dom.tsx @@ -8,7 +8,6 @@ import { SignalService as Proto } from '../../../protobuf/index.std.js'; import { PanelRow } from './PanelRow.dom.js'; import { PanelSection } from './PanelSection.dom.js'; import { Select } from '../../Select.dom.js'; -import { AxoAlertDialog } from '../../../axo/AxoAlertDialog.dom.js'; export type PropsDataType = { conversation?: ConversationType; @@ -32,8 +31,6 @@ export function GroupV2Permissions({ }: PropsType): React.JSX.Element { const AccessControlEnum = Proto.AccessControl.AccessRequired; - const [isWarningAboutClearingLabels, setIsWarningAboutClearingLabels] = - React.useState(false); const addMembersSelectId = useId(); const groupInfoSelectId = useId(); const announcementSelectId = useId(); @@ -41,17 +38,8 @@ export function GroupV2Permissions({ if (conversation === undefined) { throw new Error('GroupV2Permissions rendered without a conversation'); } - const nonAdminsHaveLabels = conversation.memberships?.some( - membership => !membership.isAdmin && membership.labelString - ); const updateAccessControlAttributes = (value: string) => { - const newValue = Number(value); - if (newValue === AccessControlEnum.ADMINISTRATOR && nonAdminsHaveLabels) { - setIsWarningAboutClearingLabels(true); - return; - } - setAccessControlAttributesSetting(conversation.id, Number(value)); }; const updateAccessControlMembers = (value: string) => { @@ -126,51 +114,6 @@ export function GroupV2Permissions({ } /> )} - { - if (!value) { - setIsWarningAboutClearingLabels(false); - } - }} - > - - - - {i18n('icu:ConversationDetails--label-clear-warning--title')} - - - {i18n( - 'icu:ConversationDetails--label-clear-warning--description' - )} - - - - { - setIsWarningAboutClearingLabels(false); - }} - > - {i18n('icu:cancel')} - - { - setAccessControlAttributesSetting( - conversation.id, - AccessControlEnum.ADMINISTRATOR - ); - setIsWarningAboutClearingLabels(false); - }} - > - {i18n('icu:ConversationDetails--label-clear-warning--continue')} - - - - ); } diff --git a/ts/groups.preload.ts b/ts/groups.preload.ts index 2b3971399..6f78157b8 100644 --- a/ts/groups.preload.ts +++ b/ts/groups.preload.ts @@ -857,9 +857,6 @@ export function buildAccessControlAttributesChange( group: ConversationAttributesType, newValue: AccessRequiredEnum ): Proto.GroupChange.Actions { - const ACCESS_ENUM = Proto.AccessControl.AccessRequired; - const ROLE_ENUM = Proto.Member.Role; - const accessControlAction = new Proto.GroupChange.Actions.ModifyAttributesAccessControlAction(); accessControlAction.attributesAccess = newValue; @@ -874,40 +871,6 @@ export function buildAccessControlAttributesChange( actions.version = (group.revision || 0) + 1; actions.modifyAttributesAccess = accessControlAction; - // Clear out all non-admin labels - const previousValue = group.accessControl?.attributes; - if ( - previousValue !== ACCESS_ENUM.ADMINISTRATOR && - newValue === ACCESS_ENUM.ADMINISTRATOR - ) { - const clientZkGroupCipher = getClientZkGroupCipher(group.secretParams); - - const modifyLabelActions = (group.membersV2 || []) - .map(member => { - if (member.role === ROLE_ENUM.ADMINISTRATOR) { - return undefined; - } - - if (!member.labelString && !member.labelEmoji) { - return undefined; - } - - const modifyLabel = - new Proto.GroupChange.Actions.ModifyMemberLabelAction(); - modifyLabel.userId = encryptServiceId(clientZkGroupCipher, member.aci); - - return modifyLabel; - }) - .filter(isNotNil); - - if (modifyLabelActions.length) { - log.info( - `buildAccessControlAttributesChange: Found ${modifyLabelActions.length} non-admins with labels. Clearing.` - ); - actions.modifyMemberLabels = modifyLabelActions; - } - } - return actions; } @@ -1271,25 +1234,6 @@ export function buildModifyMemberRoleChange({ actions.version = (group.revision || 0) + 1; actions.modifyMemberRoles = [toggleAdmin]; - const membership = group.membersV2?.find(member => member.aci === serviceId); - const onlyAdminsCanChangeAttributes = - group.accessControl?.attributes === - Proto.AccessControl.AccessRequired.ADMINISTRATOR; - const wasPreviouslyAnAdmin = - membership?.role === Proto.Member.Role.ADMINISTRATOR; - const nowNotAnAdmin = role !== Proto.Member.Role.ADMINISTRATOR; - - if ( - membership?.labelString && - onlyAdminsCanChangeAttributes && - wasPreviouslyAnAdmin && - nowNotAnAdmin - ) { - const modifyLabel = new Proto.GroupChange.Actions.ModifyMemberLabelAction(); - modifyLabel.userId = userIdCipherText; - actions.modifyMemberLabels = [modifyLabel]; - } - return actions; } diff --git a/ts/types/GroupMemberLabels.std.ts b/ts/types/GroupMemberLabels.std.ts index 10dbc6fd3..da942273f 100644 --- a/ts/types/GroupMemberLabels.std.ts +++ b/ts/types/GroupMemberLabels.std.ts @@ -5,7 +5,6 @@ import type { ConversationType, MembershipType, } from '../state/ducks/conversations.preload.js'; -import { SignalService as Proto } from '../protobuf/index.std.js'; export const missingEmojiPlaceholder = '⍰'; @@ -26,11 +25,5 @@ export function getCanAddLabel( conversation: ConversationType, membership: MembershipType | undefined ): boolean { - return Boolean( - membership && - conversation.type === 'group' && - (membership.isAdmin || - conversation.accessControlAttributes === - Proto.AccessControl.AccessRequired.MEMBER) - ); + return Boolean(membership && conversation.type === 'group'); } From d0ea6dbebcfbdb54579b88b3f150fb1b41d365d9 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Wed, 4 Mar 2026 10:07:53 -0600 Subject: [PATCH 12/54] Bump to libsignal v0.88.0 Co-authored-by: andrew-signal --- ACKNOWLEDGMENTS.md | 8 ++++---- package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- ts/RemoteConfig.dom.ts | 2 ++ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index 6050ab5e3..d1416d88f 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -5913,7 +5913,7 @@ Signal Desktop makes use of the following open source projects. libsignal makes use of the following open source projects. -## spqr 1.4.0, partial-default-derive 0.1.0, partial-default 0.1.0 +## spqr 1.5.0, partial-default-derive 0.1.0, partial-default 0.1.0 ``` GNU AFFERO GENERAL PUBLIC LICENSE @@ -7734,7 +7734,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` -## hax-lib-macros 0.3.5, hax-lib 0.3.5 +## hax-lib-macros 0.3.6, hax-lib 0.3.6 ``` @@ -8345,7 +8345,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` -## libcrux-hacl-rs 0.0.4, libcrux-hmac 0.0.4, libcrux-intrinsics 0.0.4, libcrux-macros 0.0.3, libcrux-ml-kem 0.0.5, libcrux-platform 0.0.2, libcrux-platform 0.0.3, libcrux-secrets 0.0.4, libcrux-sha2 0.0.4, libcrux-sha3 0.0.4, libcrux-sha3 0.0.5, libcrux-traits 0.0.4 +## libcrux-hacl-rs 0.0.4, libcrux-hmac 0.0.6, libcrux-intrinsics 0.0.5, libcrux-intrinsics 0.0.6, libcrux-macros 0.0.3, libcrux-ml-kem 0.0.7, libcrux-platform 0.0.3, libcrux-secrets 0.0.5, libcrux-sha2 0.0.6, libcrux-sha3 0.0.6, libcrux-sha3 0.0.7, libcrux-traits 0.0.5, libcrux-traits 0.0.6 ``` Apache License @@ -13505,7 +13505,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` -## hpke-rs-crypto 0.4.0, hpke-rs 0.5.0 +## hpke-rs-crypto 0.6.0, hpke-rs 0.6.0 ``` Mozilla Public License Version 2.0 diff --git a/package.json b/package.json index fa2fa6117..3e33088b9 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "@react-aria/utils": "3.25.3", "@react-spring/web": "10.0.3", "@react-types/shared": "3.27.0", - "@signalapp/libsignal-client": "0.87.4", + "@signalapp/libsignal-client": "0.88.0", "@signalapp/minimask": "1.0.1", "@signalapp/mute-state-change": "workspace:1.0.0", "@signalapp/quill-cjs": "2.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5502da02f..c62c130b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -126,8 +126,8 @@ importers: specifier: 3.27.0 version: 3.27.0(react@18.3.1) '@signalapp/libsignal-client': - specifier: 0.87.4 - version: 0.87.4 + specifier: 0.88.0 + version: 0.88.0 '@signalapp/minimask': specifier: 1.0.1 version: 1.0.1 @@ -3486,8 +3486,8 @@ packages: '@signalapp/libsignal-client@0.76.7': resolution: {integrity: sha512-iGWTlFkko7IKlm96Iy91Wz5sIN089nj02ifOk6BWtLzeVi0kFaNj+jK26Sl1JRXy/VfXevcYtiOivOg43BPqpg==} - '@signalapp/libsignal-client@0.87.4': - resolution: {integrity: sha512-TFfckCASjs00TUheBagyJf5ixoDo5aazz06Co+Mk8+Ie9WGIe6jt0GsLdbxu14PDBxJsEqvFxTmYAgSPGGKYCw==} + '@signalapp/libsignal-client@0.88.0': + resolution: {integrity: sha512-sgrULY4q0T+EbET7qy3Lj0jR63KfOQFtQbIemqu8nxoAHY1UBs4eJB5GPMwxQintSO1P8lYT9GjG1CGHEs+wRQ==} '@signalapp/minimask@1.0.1': resolution: {integrity: sha512-QAwo0joA60urTNbW9RIz6vLKQjy+jdVtH7cvY0wD9PVooD46MAjE40MLssp4xUJrph91n2XvtJ3pbEUDrmT2AA==} @@ -10107,17 +10107,17 @@ packages: tar@6.2.1: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} - deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me tar@7.4.3: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} - deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me tar@7.5.2: resolution: {integrity: sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==} engines: {node: '>=18'} - deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me telejson@7.2.0: resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==} @@ -14270,7 +14270,7 @@ snapshots: type-fest: 4.26.1 uuid: 11.0.2 - '@signalapp/libsignal-client@0.87.4': + '@signalapp/libsignal-client@0.88.0': dependencies: node-gyp-build: 4.8.4 type-fest: 4.26.1 diff --git a/ts/RemoteConfig.dom.ts b/ts/RemoteConfig.dom.ts index 18662a280..1263fcc29 100644 --- a/ts/RemoteConfig.dom.ts +++ b/ts/RemoteConfig.dom.ts @@ -99,6 +99,8 @@ const KnownDesktopLibsignalNetKeys = [ 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameHash', 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameLink.beta', 'desktop.libsignalNet.grpc.AccountsAnonymousLookupUsernameLink', + 'desktop.libsignalNet.grpc.MessagesAnonymousSendMultiRecipientMessage.beta', + 'desktop.libsignalNet.grpc.MessagesAnonymousSendMultiRecipientMessage', 'desktop.libsignalNet.useH2ForUnauthChat.beta', 'desktop.libsignalNet.useH2ForUnauthChat', ] as const; From 0b53aed4828b91b3146c7fb5bff094a66c73c81c Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Wed, 4 Mar 2026 10:07:59 -0600 Subject: [PATCH 13/54] Bump AppImage updater min glibc to 2.34 Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e33088b9..30fc8a9de 100644 --- a/package.json +++ b/package.json @@ -538,7 +538,7 @@ ], "releaseInfo": { "vendor": { - "minGlibcVersion": "2.31" + "minGlibcVersion": "2.34" } }, "extraResources": [ From 9945d7a2d1bca8a500e675cc0125004d7e8e1181 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Wed, 4 Mar 2026 10:08:11 -0600 Subject: [PATCH 14/54] Remove backup feature flags Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com> --- ts/RemoteConfig.dom.ts | 2 -- ts/components/Preferences.dom.stories.tsx | 19 ---------- ts/components/Preferences.dom.tsx | 43 ++++++++--------------- ts/components/PreferencesBackups.dom.tsx | 15 ++------ ts/state/smart/Preferences.preload.tsx | 3 -- ts/util/isBackupEnabled.preload.ts | 25 ++----------- 6 files changed, 19 insertions(+), 88 deletions(-) diff --git a/ts/RemoteConfig.dom.ts b/ts/RemoteConfig.dom.ts index 1263fcc29..1d4037b21 100644 --- a/ts/RemoteConfig.dom.ts +++ b/ts/RemoteConfig.dom.ts @@ -62,8 +62,6 @@ const ScalarKeys = [ 'desktop.chatFolders.beta', 'desktop.chatFolders.prod', 'desktop.clientExpiration', - 'desktop.backups.beta', - 'desktop.backups.prod', 'desktop.internalUser', 'desktop.loggingErrorToasts', 'desktop.mediaQuality.levels', diff --git a/ts/components/Preferences.dom.stories.tsx b/ts/components/Preferences.dom.stories.tsx index 6c3d0b0bb..9aeb5bb0c 100644 --- a/ts/components/Preferences.dom.stories.tsx +++ b/ts/components/Preferences.dom.stories.tsx @@ -411,7 +411,6 @@ export default { availableLocales: ['en'], availableMicrophones, availableSpeakers, - backupFeatureEnabled: false, chatFoldersFeatureEnabled: true, backupFreeMediaDays: 45, backupKeyViewed: false, @@ -1034,7 +1033,6 @@ PNPDiscoverabilityDisabled.args = { export const BackupDetailsMediaDownloadActive = Template.bind({}); BackupDetailsMediaDownloadActive.args = { settingsLocation: { page: SettingsPage.BackupsDetails }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, cloudBackupStatus: { protoSize: 100_000_000, @@ -1059,7 +1057,6 @@ BackupDetailsMediaDownloadActive.args = { export const BackupDetailsMediaDownloadPaused = Template.bind({}); BackupDetailsMediaDownloadPaused.args = { settingsLocation: { page: SettingsPage.BackupsDetails }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, cloudBackupStatus: { protoSize: 100_000_000, @@ -1085,7 +1082,6 @@ BackupDetailsMediaDownloadPaused.args = { export const BackupDetailsFree = Template.bind({}); BackupDetailsFree.args = { settingsLocation: { page: SettingsPage.BackupsDetails }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, cloudBackupStatus: { protoSize: 100_000_000, @@ -1102,7 +1098,6 @@ export const BackupsPaidActive = Template.bind({}); BackupsPaidActive.args = { settingsLocation: { page: SettingsPage.Backups }, backupTier: BackupLevel.Paid, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, cloudBackupStatus: { protoSize: 100_000_000, @@ -1122,7 +1117,6 @@ export const BackupsPaidLoadingSubscription = Template.bind({}); BackupsPaidLoadingSubscription.args = { settingsLocation: { page: SettingsPage.Backups }, backupTier: BackupLevel.Paid, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, cloudBackupStatus: { protoSize: 100_000_000, @@ -1144,7 +1138,6 @@ export const BackupsPaidLoadingFirstTime = Template.bind({}); BackupsPaidLoadingFirstTime.args = { settingsLocation: { page: SettingsPage.Backups }, backupTier: BackupLevel.Paid, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, cloudBackupStatus: { protoSize: 100_000_000, @@ -1159,7 +1152,6 @@ BackupsPaidLoadingFirstTime.args = { export const BackupsPaidCanceled = Template.bind({}); BackupsPaidCanceled.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, backupTier: BackupLevel.Paid, cloudBackupStatus: { @@ -1180,13 +1172,11 @@ export const BackupsFree = Template.bind({}); BackupsFree.args = { settingsLocation: { page: SettingsPage.Backups }, backupTier: BackupLevel.Free, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, }; export const BackupsFreeNoLocal = Template.bind({}); BackupsFreeNoLocal.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: false, backupTier: BackupLevel.Free, }; @@ -1194,7 +1184,6 @@ BackupsFreeNoLocal.args = { export const BackupsOff = Template.bind({}); BackupsOff.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, backupTier: null, }; @@ -1202,21 +1191,18 @@ BackupsOff.args = { export const BackupsLocalBackups = Template.bind({}); BackupsLocalBackups.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, }; export const BackupsRemoteEnabledLocalDisabled = Template.bind({}); BackupsRemoteEnabledLocalDisabled.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: false, }; export const BackupsPaidSubscriptionNotFound = Template.bind({}); BackupsPaidSubscriptionNotFound.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, backupSubscriptionStatus: { status: 'not-found', @@ -1231,7 +1217,6 @@ BackupsPaidSubscriptionNotFound.args = { export const BackupsSubscriptionExpired = Template.bind({}); BackupsSubscriptionExpired.args = { settingsLocation: { page: SettingsPage.Backups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, backupTier: null, backupSubscriptionStatus: { @@ -1242,7 +1227,6 @@ BackupsSubscriptionExpired.args = { export const LocalBackups = Template.bind({}); LocalBackups.args = { settingsLocation: { page: SettingsPage.LocalBackups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, backupKeyViewed: true, lastLocalBackup: { @@ -1256,7 +1240,6 @@ LocalBackups.args = { export const LocalBackupsNeverBackedUp = Template.bind({}); LocalBackupsNeverBackedUp.args = { settingsLocation: { page: SettingsPage.LocalBackups }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, backupKeyViewed: true, lastLocalBackup: undefined, @@ -1266,14 +1249,12 @@ LocalBackupsNeverBackedUp.args = { export const LocalBackupsSetupChooseFolder = Template.bind({}); LocalBackupsSetupChooseFolder.args = { settingsLocation: { page: SettingsPage.LocalBackupsSetupFolder }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, }; export const LocalBackupsSetupViewBackupKey = Template.bind({}); LocalBackupsSetupViewBackupKey.args = { settingsLocation: { page: SettingsPage.LocalBackupsSetupKey }, - backupFeatureEnabled: true, backupLocalBackupsEnabled: true, localBackupFolder: '/home/signaluser/Signal Backups/', }; diff --git a/ts/components/Preferences.dom.tsx b/ts/components/Preferences.dom.tsx index f7166dd34..8f6857426 100644 --- a/ts/components/Preferences.dom.tsx +++ b/ts/components/Preferences.dom.tsx @@ -112,7 +112,6 @@ export type PropsDataType = { // Settings accountEntropyPool: string | undefined; autoDownloadAttachment: AutoDownloadAttachmentType; - backupFeatureEnabled: boolean; backupFreeMediaDays: number; backupKeyViewed: boolean; backupLocalBackupsEnabled: boolean; @@ -385,7 +384,6 @@ export function Preferences({ availableLocales, availableMicrophones, availableSpeakers, - backupFeatureEnabled, backupMediaDownloadStatus, chatFoldersFeatureEnabled, pauseBackupMediaDownload, @@ -588,15 +586,7 @@ export function Preferences({ setLanguageDialog(null); setSelectedLanguageLocale(localeOverride); } - const shouldShowBackupsPage = - backupFeatureEnabled || backupLocalBackupsEnabled; - if ( - settingsLocation.page === SettingsPage.Backups && - !shouldShowBackupsPage - ) { - setSettingsLocation({ page: SettingsPage.General }); - } if (settingsLocation.page === SettingsPage.Internal && !isInternalUser) { setSettingsLocation({ page: SettingsPage.General }); } @@ -2282,7 +2272,6 @@ export function Preferences({ cloudBackupStatus={cloudBackupStatus} i18n={i18n} isLocalBackupsEnabled={backupLocalBackupsEnabled} - isRemoteBackupsEnabled={backupFeatureEnabled} lastLocalBackup={lastLocalBackup} locale={resolvedLocale} localBackupFolder={localBackupFolder} @@ -2534,23 +2523,21 @@ export function Preferences({ > {i18n('icu:Preferences__button--data-usage')} - {shouldShowBackupsPage ? ( - - ) : null} +