colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix units of global.safetyNumberAci

Browse Source
This commit is contained in:
Fedor Indutny
2023-11-01 00:07:45 +01:00
committed by GitHub
parent a33e7d7622
commit 657a140dbe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ts/state/selectors/items.ts
View File

@@ -18,7 +18,7 @@ import type { AciString } from '../../types/ServiceId';
import { DEFAULT_CONVERSATION_COLOR } from '../../types/Colors'; import { DEFAULT_CONVERSATION_COLOR } from '../../types/Colors';
import { getPreferredReactionEmoji as getPreferredReactionEmojiFromStoredValue } from '../../reactions/preferredReactionEmoji'; import { getPreferredReactionEmoji as getPreferredReactionEmojiFromStoredValue } from '../../reactions/preferredReactionEmoji';
import { isBeta } from '../../util/version'; import { isBeta } from '../../util/version';
import { DurationInSeconds } from '../../util/durations'; import { DurationInSeconds, SECOND } from '../../util/durations';
import { generateUsernameLink } from '../../util/sgnlHref'; import { generateUsernameLink } from '../../util/sgnlHref';
import * as Bytes from '../../Bytes'; import * as Bytes from '../../Bytes';
import { getUserNumber, getUserACI } from './user'; import { getUserNumber, getUserACI } from './user';
@@ -188,14 +188,14 @@ export const getSafetyNumberMode = createSelector(
return SafetyNumberMode.JustE164; return SafetyNumberMode.JustE164;
} }
const timestamp = remoteConfig['global.safetyNumberAci']?.value; const timestampInSeconds = remoteConfig['global.safetyNumberAci']?.value;
if (typeof timestamp !== 'number') { if (typeof timestampInSeconds !== 'number') {
return SafetyNumberMode.DefaultE164AndThenACI; return SafetyNumberMode.DefaultE164AndThenACI;
} }
// Note: serverTimeSkew is a difference between server time and local time, // 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. // so we have to add local time to it to correct it for a skew.
return now + serverTimeSkew >= timestamp return now + serverTimeSkew >= timestampInSeconds * SECOND
? SafetyNumberMode.DefaultACIAndMaybeE164 ? SafetyNumberMode.DefaultACIAndMaybeE164
: SafetyNumberMode.DefaultE164AndThenACI; : SafetyNumberMode.DefaultE164AndThenACI;
} }