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

Allow users who have disabled Contacts permission to hide system contacts.

Browse source
This commit is contained in:
Alex Hart 2024-05-03 11:22:08 -03:00
parent 36c91a95e2
commit 70d74e0bb1
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
View file

@ -334,13 +334,7 @@ public class NewConversationActivity extends ContactSelectionActivity
R.drawable.ic_minus_circle_20, // TODO [alex] -- correct asset R.drawable.ic_minus_circle_20, // TODO [alex] -- correct asset
getString(R.string.NewConversationActivity__remove), getString(R.string.NewConversationActivity__remove),
R.color.signal_colorOnSurface, R.color.signal_colorOnSurface,
() -> { () -> displayRemovalDialog(recipient)
if (recipient.isSystemContact()) {
displayIsInSystemContactsDialog(recipient);
} else {
displayRemovalDialog(recipient);
}
}
); );
} }

2
app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
View file

@ -724,7 +724,7 @@ public class GroupsV2StateProcessor {
ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId)); ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId));
//noinspection UnnecessaryReturnStatement //noinspection UnnecessaryReturnStatement
return; return;
} else if (addedBy.isSystemContact() || addedBy.isProfileSharing()) { } else if ((addedBy.isSystemContact() || addedBy.isProfileSharing()) && !addedBy.isHidden()) {
Log.i(TAG, "Group 'adder' is trusted. contact: " + addedBy.isSystemContact() + ", profileSharing: " + addedBy.isProfileSharing()); Log.i(TAG, "Group 'adder' is trusted. contact: " + addedBy.isSystemContact() + ", profileSharing: " + addedBy.isProfileSharing());
Log.i(TAG, "Added to a group and auto-enabling profile sharing"); Log.i(TAG, "Added to a group and auto-enabling profile sharing");
recipientTable.setProfileSharing(Recipient.externalGroupExact(groupId).getId(), true); recipientTable.setProfileSharing(Recipient.externalGroupExact(groupId).getId(), true);