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

Use UUIDs in group database schema

Browse source
This commit is contained in:
Fedor Indutny 2021-10-26 15:59:08 -07:00 • committed by GitHub
parent 74fde10ff5
commit 63fcdbe787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 4530 additions and 3664 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/state/smart/CallManager.tsx
View file

@ -17,6 +17,7 @@ import type {
ActiveCallType,
GroupCallRemoteParticipantType,
} from '../../types/Calling';
import type { UUIDStringType } from '../../types/UUID';
import { CallMode, CallState } from '../../types/Calling';
import type { StateType } from '../reducer';
import { missingCaseError } from '../../util/missingCaseError';
@ -117,7 +118,7 @@ const mapStateToActiveCallProp = (
}
const conversationSelectorByUuid = memoize<
(uuid: string) => undefined | ConversationType
(uuid: UUIDStringType) => undefined | ConversationType
>(uuid => {
const conversationId = window.ConversationController.ensureContactIds({
uuid,
@ -175,9 +176,9 @@ const mapStateToActiveCallProp = (
const { memberships = [] } = conversation;
for (let i = 0; i < memberships.length; i += 1) {
const { conversationId } = memberships[i];
const member = conversationSelectorByUuid(conversationId);
const { uuid } = memberships[i];
const member = conversationSelector(uuid);
if (!member) {
log.error('Group member has no corresponding conversation');
continue;