mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Sender Key: Prepare for testing in beta

Browse source
This commit is contained in:
Scott Nonnenberg 2021-08-02 17:12:49 -07:00 • committed by GitHub
parent c5de4c6284
commit ab5a12fded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/util/handleRetry.ts
View file

@ -7,7 +7,8 @@ import {
} from '@signalapp/signal-client';
import { isNumber } from 'lodash';
import { assert } from './assert';
import { isBeta } from './version';
import { strictAssert } from './assert';
import { getSendOptions } from './getSendOptions';
import { handleMessageSend } from './handleMessageSend';
import { isGroupV2 } from './whatTypeOfConversation';
@ -116,13 +117,11 @@ export async function onRetryRequest(event: RetryRequestEvent): Promise<void> {
}
function maybeShowDecryptionToast(logId: string) {
if (!RemoteConfig.isEnabled('desktop.internalUser')) {
if (!isBeta(window.getVersion())) {
return;
}
window.log.info(
`onDecryptionError/${logId}: Showing toast for internal user`
);
window.log.info(`onDecryptionError/${logId}: Showing decryption error toast`);
window.Whisper.ToastView.show(
window.Whisper.DecryptionErrorToast,
document.getElementsByClassName('conversation-stack')[0]
@ -434,7 +433,7 @@ async function requestResend(decryptionError: DecryptionErrorEventData) {
// We believe that it could be successfully re-sent, so we'll add a placeholder.
if (contentHint === ContentHint.RESENDABLE) {
const { retryPlaceholders } = window.Signal.Services;
assert(retryPlaceholders, 'requestResend: adding placeholder');
strictAssert(retryPlaceholders, 'requestResend: adding placeholder');
window.log.info(`requestResend/${logId}: Adding placeholder`);