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

Interpret unknown phone number sharing setting as 'off'.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-06 14:47:57 -05:00
committed by Cody Henthorne
parent c359ddf3c8
commit 879fca0e11
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/keyvalue/PhoneNumberPrivacyValues.java
View File

@@ -43,10 +43,9 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
}
public boolean isPhoneNumberSharingEnabled() {
// TODO [pnp] When we launch usernames, the default should return false
return switch (getPhoneNumberSharingMode()) {
case DEFAULT, EVERYBODY -> true;
case NOBODY -> false;
case EVERYBODY -> true;
case DEFAULT, NOBODY -> false;
};
}

2
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -691,7 +691,7 @@ public class Recipient {
* Whether or not we should show this user's e164 in the interface.
*/
public boolean shouldShowE164() {
return hasE164() && (isSystemContact() || getPhoneNumberSharing() != PhoneNumberSharingState.DISABLED);
return hasE164() && (isSystemContact() || getPhoneNumberSharing() == PhoneNumberSharingState.ENABLED);
}
public @NonNull Optional<String> getEmail() {

3
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
View File

@@ -65,9 +65,8 @@ public final class StorageSyncModels {
}
public static AccountRecord.PhoneNumberSharingMode localToRemotePhoneNumberSharingMode(PhoneNumberPrivacyValues.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
// TODO [pnp] When we launch usernames, we want DEFAULT to map to NOBODY. In fact, we can just pass a boolean into this function instead of an enum.
switch (phoneNumberPhoneNumberSharingMode) {
case DEFAULT : return AccountRecord.PhoneNumberSharingMode.UNKNOWN;
case DEFAULT : return AccountRecord.PhoneNumberSharingMode.NOBODY;
case EVERYBODY: return AccountRecord.PhoneNumberSharingMode.EVERYBODY;
case NOBODY : return AccountRecord.PhoneNumberSharingMode.NOBODY;
default : throw new AssertionError();