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

Ensure that isConversationUnregistered is not called on groups

Browse source
This commit is contained in:
Scott Nonnenberg 2023-08-09 13:19:32 -07:00 • committed by Jamie Kyle
parent 063ef87e48
commit 13470a789c
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/jobs/helpers/sendSenderKeyDistribution.ts
View file

@ -48,7 +48,9 @@ export async function sendSenderKeyDistribution(
); );
if (!isDirectConversation(conversation.attributes)) { if (!isDirectConversation(conversation.attributes)) {
log.info('Failing attempt to send null message to group'); log.info(
'Failing attempt to send sender key distribution message to group'
);
return; return;
} }

6
ts/services/storage.ts
View file

@ -43,6 +43,7 @@ import { map, filter } from '../util/iterables';
import { ourProfileKeyService } from './ourProfileKey'; import { ourProfileKeyService } from './ourProfileKey';
import { import {
ConversationTypes, ConversationTypes,
isDirectConversation,
typeofConversation, typeofConversation,
} from '../util/whatTypeOfConversation'; } from '../util/whatTypeOfConversation';
import { SignalService as Proto } from '../protobuf'; import { SignalService as Proto } from '../protobuf';
@ -1204,7 +1205,10 @@ async function processManifest(
// Remote might have dropped this conversation already, but our value of // Remote might have dropped this conversation already, but our value of
// `firstUnregisteredAt` is too high for us to drop it. Don't reupload it! // `firstUnregisteredAt` is too high for us to drop it. Don't reupload it!
if (conversation.isUnregistered()) { if (
isDirectConversation(conversation.attributes) &&
conversation.isUnregistered()
) {
log.info( log.info(
`storageService.process(${version}): localKey=${missingKey} is ` + `storageService.process(${version}): localKey=${missingKey} is ` +
'unregistered and not in remote manifest' 'unregistered and not in remote manifest'

5
ts/state/selectors/conversations.ts
View file

@ -496,7 +496,7 @@ function canComposeConversation(conversation: ConversationType): boolean {
!isSignalConversation(conversation) && !isSignalConversation(conversation) &&
!conversation.isBlocked && !conversation.isBlocked &&
!conversation.removalStage && !conversation.removalStage &&
!isConversationUnregistered(conversation) && (isGroupV2(conversation) || !isConversationUnregistered(conversation)) &&
hasDisplayInfo(conversation) && hasDisplayInfo(conversation) &&
isTrusted(conversation) isTrusted(conversation)
); );
@ -511,7 +511,8 @@ export const getAllComposableConversations = createSelector(
!conversation.isBlocked && !conversation.isBlocked &&
!conversation.removalStage && !conversation.removalStage &&
!conversation.isGroupV1AndDisabled && !conversation.isGroupV1AndDisabled &&
!isConversationUnregistered(conversation) && (isGroupV2(conversation) ||
!isConversationUnregistered(conversation)) &&
// All conversation should have a title except in weird cases where // All conversation should have a title except in weird cases where
// they don't, in that case we don't want to show these for Forwarding. // they don't, in that case we don't want to show these for Forwarding.
conversation.titleNoDefault && conversation.titleNoDefault &&