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

Remove safetyNumberAci remote configuration

Browse source
This commit is contained in:
Fedor Indutny 2023-11-01 21:35:55 +01:00 • committed by GitHub
parent ab0c12847d
commit aa03ac36bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 50 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ts/state/selectors/items.ts
View file

@ -5,7 +5,6 @@ import { createSelector } from 'reselect';
import { isInteger } from 'lodash';
import { ITEM_NAME as UNIVERSAL_EXPIRE_TIMER_ITEM } from '../../util/universalExpireTimer';
import { SafetyNumberMode } from '../../types/safetyNumber';
import { innerIsBucketValueEnabled } from '../../RemoteConfig';
import type { ConfigKeyType, ConfigMapType } from '../../RemoteConfig';
import type { StateType } from '../reducer';
@ -18,7 +17,7 @@ import type { AciString } from '../../types/ServiceId';
import { DEFAULT_CONVERSATION_COLOR } from '../../types/Colors';
import { getPreferredReactionEmoji as getPreferredReactionEmojiFromStoredValue } from '../../reactions/preferredReactionEmoji';
import { isBeta } from '../../util/version';
import { DurationInSeconds, SECOND } from '../../util/durations';
import { DurationInSeconds } from '../../util/durations';
import { generateUsernameLink } from '../../util/sgnlHref';
import * as Bytes from '../../Bytes';
import { getUserNumber, getUserACI } from './user';
@ -167,40 +166,6 @@ export const getStoriesEnabled = createSelector(
}
);
export const getSafetyNumberMode = createSelector(
getRemoteConfig,
getServerTimeSkew,
(_state: StateType, { now }: { now: number }) => now,
(
remoteConfig: ConfigMapType,
serverTimeSkew: number,
now: number
): SafetyNumberMode => {
if (
!isRemoteConfigFlagEnabled(remoteConfig, 'desktop.safetyNumberAci') &&
!(
isRemoteConfigFlagEnabled(
remoteConfig,
'desktop.safetyNumberAci.beta'
) && isBeta(window.getVersion())
)
) {
return SafetyNumberMode.JustE164;
}
const timestampInSeconds = remoteConfig['global.safetyNumberAci']?.value;
if (typeof timestampInSeconds !== 'number') {
return SafetyNumberMode.DefaultE164AndThenACI;
}
// Note: serverTimeSkew is a difference between server time and local time,
// so we have to add local time to it to correct it for a skew.
return now + serverTimeSkew >= timestampInSeconds * SECOND
? SafetyNumberMode.DefaultACIAndMaybeE164
: SafetyNumberMode.DefaultE164AndThenACI;
}
);
export const getDefaultConversationColor = createSelector(
getItems,
(