Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gv2 create/join bugs when profile credential is invalid.

Browse Source
This commit is contained in:
Cody Henthorne
2025-03-24 14:45:55 -04:00
parent eba5c5ceeb
commit 3e1edfbc67
2 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
View File

@@ -471,15 +471,21 @@ final class GroupManagerV2 {
Log.i(TAG, "Profile Key does not match that in group " + groupId);
}
GroupCandidate groupCandidate = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
GroupCandidate selfGroupCandidate = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!groupCandidate.hasValidProfileKeyCredential()) {
if (!selfGroupCandidate.hasValidProfileKeyCredential()) {
Log.w(TAG, "[updateSelfProfileKeyInGroup] No credential available, repairing");
AppDependencies.getJobManager().add(new ProfileUploadJob());
return null;
ProfileUtil.uploadProfile(context);
selfGroupCandidate = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!selfGroupCandidate.hasValidProfileKeyCredential()) {
Log.w(TAG, "[updateSelfProfileKeyInGroup] Still unable to get credential");
AppDependencies.getJobManager().add(new ProfileUploadJob());
throw new GroupChangeFailedException("No profile credential for self, unable to update profile key in group");
}
}
return commitChangeWithConflictResolution(selfAci, groupOperations.createUpdateProfileKeyCredentialChange(groupCandidate.requireExpiringProfileKeyCredential()));
return commitChangeWithConflictResolution(selfAci, groupOperations.createUpdateProfileKeyCredentialChange(selfGroupCandidate.requireExpiringProfileKeyCredential()));
}
@WorkerThread
@@ -497,18 +503,24 @@ final class GroupManagerV2 {
Optional<DecryptedPendingMember> aciInPending = DecryptedGroupUtil.findPendingByServiceId(group.pendingMembers, selfAci);
Optional<DecryptedPendingMember> pniInPending = DecryptedGroupUtil.findPendingByServiceId(group.pendingMembers, selfPni);
GroupCandidate groupCandidate = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
GroupCandidate selfGroupCandidate = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!groupCandidate.hasValidProfileKeyCredential()) {
Log.w(TAG, "[AcceptInvite] No credential available, repairing");
AppDependencies.getJobManager().add(new ProfileUploadJob());
return null;
if (!selfGroupCandidate.hasValidProfileKeyCredential()) {
Log.w(TAG, "[acceptInvite] No credential available, repairing");
ProfileUtil.uploadProfile(context);
selfGroupCandidate = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!selfGroupCandidate.hasValidProfileKeyCredential()) {
Log.w(TAG, "[acceptInvite] Still unable to get credential");
AppDependencies.getJobManager().add(new ProfileUploadJob());
throw new GroupChangeFailedException("No profile credential for self, unable to accept invite");
}
}
if (aciInPending.isPresent()) {
return commitChangeWithConflictResolution(selfAci, groupOperations.createAcceptInviteChange(groupCandidate.requireExpiringProfileKeyCredential()));
return commitChangeWithConflictResolution(selfAci, groupOperations.createAcceptInviteChange(selfGroupCandidate.requireExpiringProfileKeyCredential()));
} else if (pniInPending.isPresent()) {
return commitChangeWithConflictResolution(selfPni, groupOperations.createAcceptPniInviteChange(groupCandidate.requireExpiringProfileKeyCredential()));
return commitChangeWithConflictResolution(selfPni, groupOperations.createAcceptPniInviteChange(selfGroupCandidate.requireExpiringProfileKeyCredential()));
}
throw new GroupChangeFailedException("Unable to accept invite when not in pending list");
@@ -789,6 +801,8 @@ final class GroupManagerV2 {
throw new MembershipNotSuitableForV2Exception("At least one potential new member does not support GV2 capability or we don't have their UUID");
}
SignalDatabase.recipients().clearProfileKeyCredential(Recipient.self().getId());
GroupCandidate self = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
Set<GroupCandidate> candidates = new HashSet<>(groupCandidateHelper.recipientIdsToCandidates(members));
@@ -798,8 +812,16 @@ final class GroupManagerV2 {
}
if (!self.hasValidProfileKeyCredential()) {
Log.w(TAG, "Cannot create a V2 group as self does not have a versioned profile");
throw new MembershipNotSuitableForV2Exception("Cannot create a V2 group as self does not have a versioned profile");
Log.w(TAG, "[createGroupOnServer] No profile credential for self, repairing");
ProfileUtil.uploadProfile(context);
self = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!self.hasValidProfileKeyCredential()) {
Log.w(TAG, "[createGroupOnServer] Still unable to get credential");
AppDependencies.getJobManager().add(new ProfileUploadJob());
throw new MembershipNotSuitableForV2Exception("Cannot create a V2 group as self does not have a versioned profile");
}
}
GroupsV2Operations.NewGroup newGroup = groupsV2Operations.createNewGroup(groupSecretParams,
@@ -1038,7 +1060,15 @@ final class GroupManagerV2 {
GroupCandidate self = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!self.hasValidProfileKeyCredential()) {
throw new MembershipNotSuitableForV2Exception("No profile key credential for self");
Log.w(TAG, "[joinGroupOnServer] No profile credential for self, repairing");
ProfileUtil.uploadProfile(context);
self = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
if (!self.hasValidProfileKeyCredential()) {
Log.w(TAG, "[joinGroupOnServer] Still unable to get credential");
AppDependencies.getJobManager().add(new ProfileUploadJob());
throw new MembershipNotSuitableForV2Exception("Unable to join group, no profile key credential for self");
}
}
ExpiringProfileKeyCredential expiringProfileKeyCredential = self.requireExpiringProfileKeyCredential();

4
app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
View File

@@ -335,7 +335,11 @@ public final class ProfileUtil {
Log.i(TAG, String.format("Got new profile key credential for recipient %s", recipient.getId()));
return profileKeyCredentialOptional;
}
} else {
Log.w(TAG, "Failed to fetch updated profile key credential for recipient " + recipient.getId());
}
} else {
Log.w(TAG, "Unable to fetch credential as no profile key exists for " + recipient.getId());
}
return Optional.empty();