diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
index 373e7e0322b..7b199de76a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
@@ -62,7 +62,8 @@ public class ManageGroupFragment extends Fragment {
private ManageGroupViewModel viewModel;
private GroupMemberListView groupMemberList;
- private View listPending;
+ private View pendingMembersRow;
+ private TextView pendingMembersCount;
private Toolbar toolbar;
private TextView memberCountUnderAvatar;
private TextView memberCountAboveList;
@@ -124,7 +125,8 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
memberCountUnderAvatar = view.findViewById(R.id.member_count);
memberCountAboveList = view.findViewById(R.id.member_count_2);
groupMemberList = view.findViewById(R.id.group_members);
- listPending = view.findViewById(R.id.listPending);
+ pendingMembersRow = view.findViewById(R.id.pending_members_row);
+ pendingMembersCount = view.findViewById(R.id.pending_members_count);
threadPhotoRailView = view.findViewById(R.id.recent_photos);
groupMediaCard = view.findViewById(R.id.group_media_card);
accessControlCard = view.findViewById(R.id.group_access_control_card);
@@ -171,16 +173,15 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
});
viewModel.getPendingMemberCount().observe(getViewLifecycleOwner(),
- members -> {
- if (members > 0) {
- listPending.setEnabled(true);
- listPending.setOnClickListener(v -> {
- FragmentActivity activity = requireActivity();
- activity.startActivity(PendingMemberInvitesActivity.newIntent(activity, groupId.requireV2()));
- });
+ pendingInviteCount -> {
+ pendingMembersRow.setOnClickListener(v -> {
+ FragmentActivity activity = requireActivity();
+ activity.startActivity(PendingMemberInvitesActivity.newIntent(activity, groupId.requireV2()));
+ });
+ if (pendingInviteCount == 0) {
+ pendingMembersCount.setText(R.string.ManageGroupActivity_none);
} else {
- listPending.setEnabled(false);
- listPending.setOnClickListener(null);
+ pendingMembersCount.setText(getResources().getQuantityString(R.plurals.ManageGroupActivity_invited, pendingInviteCount, pendingInviteCount));
}
});
diff --git a/app/src/main/res/layout/group_manage_fragment.xml b/app/src/main/res/layout/group_manage_fragment.xml
index 68baaea9ff2..b123ef4a2eb 100644
--- a/app/src/main/res/layout/group_manage_fragment.xml
+++ b/app/src/main/res/layout/group_manage_fragment.xml
@@ -403,12 +403,34 @@
app:cardBackgroundColor="?android:attr/windowBackground"
app:layout_constraintTop_toBottomOf="@id/group_membership_card">
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb8b4d4678a..090e67a79fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -516,6 +516,11 @@
Add members
View all members
+ None
+
+ - %d invited
+
+
You don\'t have the rights to do this
Someone you added does not support new groups and needs to update Signal
Failed to update the group