empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix group limit enforcement and display.

Browse source
This commit is contained in:
Alan Evans 2020-08-28 14:22:14 -03:00
parent 40a8d21c15
commit e316a70b6c
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
View file

@ -512,7 +512,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
}
private boolean selectionLimitReached() {
return getChipCount() >= selectionLimit;
return getChipCount() + currentSelection.size() >= selectionLimit;
}
private void markContactSelected(@NonNull SelectedContact selectedContact) {

18
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupRepository.java
View file

@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@ -197,6 +198,23 @@ final class ManageGroupRepository {
public int getTotalCapacity() {
return totalCapacity;
}
public int getRemainingCapacity() {
return totalCapacity - members.size();
}
public @NonNull ArrayList<RecipientId> getMembersWithoutSelf() {
ArrayList<RecipientId> recipientIds = new ArrayList<>(members.size());
RecipientId selfId = Recipient.self().getId();
for (RecipientId recipientId : members) {
if (!recipientId.equals(selfId)) {
recipientIds.add(recipientId);
}
}
return recipientIds;
}
}
}

6
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupViewModel.java
View file

@ -314,15 +314,15 @@ public class ManageGroupViewModel extends ViewModel {
public void onAddMembersClick(@NonNull Fragment fragment, int resultCode) {
manageGroupRepository.getGroupCapacity(capacity -> {
int remainingCapacity = capacity.getTotalCapacity();
int remainingCapacity = capacity.getRemainingCapacity();
if (remainingCapacity <= 0) {
Toast.makeText(fragment.requireContext(), R.string.ContactSelectionListFragment_the_group_is_full, Toast.LENGTH_SHORT).show();
} else {
Intent intent = new Intent(fragment.requireActivity(), AddMembersActivity.class);
intent.putExtra(AddMembersActivity.GROUP_ID, manageGroupRepository.getGroupId().toString());
intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, ContactsCursorLoader.DisplayMode.FLAG_PUSH);
intent.putExtra(ContactSelectionListFragment.TOTAL_CAPACITY, remainingCapacity);
intent.putParcelableArrayListExtra(ContactSelectionListFragment.CURRENT_SELECTION, new ArrayList<>(capacity.getMembers()));
intent.putExtra(ContactSelectionListFragment.TOTAL_CAPACITY, capacity.getTotalCapacity() - 1);
intent.putParcelableArrayListExtra(ContactSelectionListFragment.CURRENT_SELECTION, capacity.getMembersWithoutSelf());
fragment.startActivityForResult(intent, resultCode);
}
});