-
-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for GV2 group update messages.
- Loading branch information
1 parent
1f99449
commit 326678f
Showing
4 changed files
with
996 additions
and
0 deletions.
There are no files selected for viewing
310 changes: 310 additions & 0 deletions
310
...rc/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,310 @@ | ||
| package org.thoughtcrime.securesms.database.model; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
|
|
||
| import com.google.protobuf.ByteString; | ||
|
|
||
| import org.signal.storageservice.protos.groups.AccessControl; | ||
| import org.signal.storageservice.protos.groups.Member; | ||
| import org.signal.storageservice.protos.groups.local.DecryptedGroupChange; | ||
| import org.signal.storageservice.protos.groups.local.DecryptedMember; | ||
| import org.signal.storageservice.protos.groups.local.DecryptedModifyMemberRole; | ||
| import org.signal.storageservice.protos.groups.local.DecryptedPendingMember; | ||
| import org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval; | ||
| import org.thoughtcrime.securesms.R; | ||
| import org.thoughtcrime.securesms.groups.GV2AccessLevelUtil; | ||
| import org.thoughtcrime.securesms.util.ExpirationUtil; | ||
| import org.whispersystems.signalservice.api.util.UuidUtil; | ||
|
|
||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| final class GroupsV2UpdateMessageProducer { | ||
|
|
||
| @NonNull private final Context context; | ||
| @NonNull private final DescribeMemberStrategy descriptionStrategy; | ||
| @NonNull private final ByteString youUuid; | ||
|
|
||
| /** | ||
| * @param descriptionStrategy Strategy for member description. | ||
| */ | ||
| GroupsV2UpdateMessageProducer(@NonNull Context context, | ||
| @NonNull DescribeMemberStrategy descriptionStrategy, | ||
| @NonNull UUID you) | ||
| { | ||
| this.context = context; | ||
| this.descriptionStrategy = descriptionStrategy; | ||
| this.youUuid = UuidUtil.toByteString(you); | ||
| } | ||
|
|
||
| List<String> describeChange(@NonNull DecryptedGroupChange change) { | ||
| List<String> updates = new LinkedList<>(); | ||
|
|
||
| describeMemberAdditions(change, updates); | ||
| describeMemberRemovals(change, updates); | ||
| describeModifyMemberRoles(change, updates); | ||
| describeInvitations(change, updates); | ||
| describeRevokedInvitations(change, updates); | ||
| describePromotePending(change, updates); | ||
| describeNewTitle(change, updates); | ||
| describeNewAvatar(change, updates); | ||
| describeNewTimer(change, updates); | ||
| describeNewAttributeAccess(change, updates); | ||
| describeNewMembershipAccess(change, updates); | ||
|
|
||
| if (updates.isEmpty()) { | ||
| describeUnknownChange(change, updates); | ||
| } | ||
|
|
||
| return updates; | ||
| } | ||
|
|
||
| /** | ||
| * Handles case of future protocol versions where we don't know what has changed. | ||
| */ | ||
| private void describeUnknownChange(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_updated_group)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_updated_group, describe(change.getEditor()))); | ||
| } | ||
| } | ||
|
|
||
| private void describeMemberAdditions(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| for (DecryptedMember member : change.getNewMembersList()) { | ||
| boolean newMemberIsYou = member.getUuid().equals(youUuid); | ||
|
|
||
| if (editorIsYou) { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_joined_the_group)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_you_added_s, describe(member.getUuid()))); | ||
| } | ||
| } else { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_added_you, describe(change.getEditor()))); | ||
| } else { | ||
| if (member.getUuid().equals(change.getEditor())) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_joined_the_group, describe(member.getUuid()))); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_added_s, describe(change.getEditor()), describe(member.getUuid()))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeMemberRemovals(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| for (ByteString member : change.getDeleteMembersList()) { | ||
| boolean newMemberIsYou = member.equals(youUuid); | ||
|
|
||
| if (editorIsYou) { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_left_the_group)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_you_removed_s, describe(member))); | ||
| } | ||
| } else { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_removed_you_from_the_group, describe(change.getEditor()))); | ||
| } else { | ||
| if (member.equals(change.getEditor())) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_left_the_group, describe(member))); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_removed_s, describe(change.getEditor()), describe(member))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeModifyMemberRoles(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| for (DecryptedModifyMemberRole roleChange : change.getModifyMemberRolesList()) { | ||
| if (roleChange.getRole() == Member.Role.ADMINISTRATOR) { | ||
| boolean newMemberIsYou = roleChange.getUuid().equals(youUuid); | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_made_s_an_admin, describe(roleChange.getUuid()))); | ||
| } else { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_made_you_an_admin, describe(change.getEditor()))); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_made_s_an_admin, describe(change.getEditor()), describe(roleChange.getUuid()))); | ||
|
|
||
| } | ||
| } | ||
| } else { | ||
| boolean newMemberIsYou = roleChange.getUuid().equals(youUuid); | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_revoked_admin_privileges_from_s, describe(roleChange.getUuid()))); | ||
| } else { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_revoked_your_admin_privileges, describe(change.getEditor()))); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_revoked_admin_privileges_from_s, describe(change.getEditor()), describe(roleChange.getUuid()))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeInvitations(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
| int notYouInviteCount = 0; | ||
|
|
||
| for (DecryptedPendingMember invitee : change.getNewPendingMembersList()) { | ||
| boolean newMemberIsYou = invitee.getUuid().equals(youUuid); | ||
|
|
||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_invited_you_to_the_group, describe(change.getEditor()))); | ||
| } else { | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_invited_s_to_the_group, describe(invitee.getUuid()))); | ||
| } else { | ||
| notYouInviteCount++; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (notYouInviteCount > 0) { | ||
| updates.add(context.getResources().getQuantityString(R.plurals.MessageRecord_s_invited_members, notYouInviteCount, describe(change.getEditor()), notYouInviteCount)); | ||
| } | ||
| } | ||
|
|
||
| private void describeRevokedInvitations(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
| int notDeclineCount = 0; | ||
|
|
||
| for (DecryptedPendingMemberRemoval invitee : change.getDeletePendingMembersList()) { | ||
| boolean decline = invitee.getUuid().equals(change.getEditor()); | ||
| if (decline) { | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_declined_the_invitation_to_the_group)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_someone_declined_an_invitation_to_the_group)); | ||
| } | ||
| } else { | ||
| notDeclineCount++; | ||
| } | ||
| } | ||
|
|
||
| if (notDeclineCount > 0) { | ||
| if (editorIsYou) { | ||
| updates.add(context.getResources().getQuantityString(R.plurals.MessageRecord_you_revoked_invites, notDeclineCount, notDeclineCount)); | ||
| } else { | ||
| updates.add(context.getResources().getQuantityString(R.plurals.MessageRecord_s_revoked_invites, notDeclineCount, describe(change.getEditor()), notDeclineCount)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describePromotePending(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| for (ByteString member : change.getPromotePendingMembersList()) { | ||
| boolean newMemberIsYou = member.equals(youUuid); | ||
|
|
||
| if (editorIsYou) { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_accepted_invite)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_you_added_invited_member_s, describe(member))); | ||
| } | ||
| } else { | ||
| if (newMemberIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_added_you, describe(change.getEditor()))); | ||
| } else { | ||
| if (member.equals(change.getEditor())) { | ||
| updates.add(context.getString(R.string.MessageRecord_s_accepted_invite, describe(member))); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_added_invited_member_s, describe(change.getEditor()), describe(member))); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeNewTitle(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| if (change.hasNewTitle()) { | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_changed_the_group_name_to_s, change.getNewTitle().getValue())); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_changed_the_group_name_to_s, describe(change.getEditor()), change.getNewTitle().getValue())); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeNewAvatar(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| if (change.hasNewAvatar()) { | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_changed_the_group_avatar)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_changed_the_group_avatar, describe(change.getEditor()))); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeNewTimer(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| if (change.hasNewTimer()) { | ||
| String time = ExpirationUtil.getExpirationDisplayValue(context, change.getNewTimer().getDuration()); | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, describe(change.getEditor()), time)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeNewAttributeAccess(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| if (change.getNewAttributeAccess() != AccessControl.AccessRequired.UNKNOWN) { | ||
| String accessLevel = GV2AccessLevelUtil.toString(context, change.getNewAttributeAccess()); | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_changed_who_can_edit_group_info_to_s, accessLevel)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_changed_who_can_edit_group_info_to_s, describe(change.getEditor()), accessLevel)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void describeNewMembershipAccess(@NonNull DecryptedGroupChange change, @NonNull List<String> updates) { | ||
| boolean editorIsYou = change.getEditor().equals(youUuid); | ||
|
|
||
| if (change.getNewMemberAccess() != AccessControl.AccessRequired.UNKNOWN) { | ||
| String accessLevel = GV2AccessLevelUtil.toString(context, change.getNewMemberAccess()); | ||
| if (editorIsYou) { | ||
| updates.add(context.getString(R.string.MessageRecord_you_changed_who_can_edit_group_membership_to_s, accessLevel)); | ||
| } else { | ||
| updates.add(context.getString(R.string.MessageRecord_s_changed_who_can_edit_group_membership_to_s, describe(change.getEditor()), accessLevel)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private @NonNull String describe(@NonNull ByteString uuid) { | ||
| return descriptionStrategy.describe(UuidUtil.fromByteString(uuid)); | ||
| } | ||
|
|
||
| interface DescribeMemberStrategy { | ||
|
|
||
| /** | ||
| * Map a UUID to a string that describes the group member. | ||
| */ | ||
| @NonNull String describe(@NonNull UUID uuid); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
app/src/main/java/org/thoughtcrime/securesms/groups/GV2AccessLevelUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package org.thoughtcrime.securesms.groups; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
|
|
||
| import org.signal.storageservice.protos.groups.AccessControl; | ||
| import org.thoughtcrime.securesms.R; | ||
|
|
||
| public final class GV2AccessLevelUtil { | ||
|
|
||
| private GV2AccessLevelUtil() { | ||
| } | ||
|
|
||
| public static String toString(@NonNull Context context, @NonNull AccessControl.AccessRequired attributeAccess) { | ||
| switch (attributeAccess) { | ||
| case ANY : return context.getString(R.string.GroupManagement_access_level_anyone); | ||
| case MEMBER : return context.getString(R.string.GroupManagement_access_level_all_members); | ||
| case ADMINISTRATOR : return context.getString(R.string.GroupManagement_access_level_only_admins); | ||
| default : return context.getString(R.string.GroupManagement_access_level_unknown); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.