webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default number sharing to NOBODY

Browse source 
Matches the official apps behavior.

Closes #1472
This commit is contained in:
AsamK 2024-02-26 18:27:09 +01:00
parent 378ac23c6c
commit df76aa9919
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
View file

@ -98,7 +98,7 @@ public class UnidentifiedAccessHelper {
private byte[] getSenderCertificateFor(final RecipientId recipientId) {
final var sharingMode = account.getConfigurationStore().getPhoneNumberSharingMode();
if (sharingMode == null || sharingMode == PhoneNumberSharingMode.EVERYBODY || (
if (sharingMode == PhoneNumberSharingMode.EVERYBODY || (
sharingMode == PhoneNumberSharingMode.CONTACTS
&& account.getContactStore().getContact(recipientId) != null
)) {

11
lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
View file

@ -16,7 +16,6 @@ import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
import org.whispersystems.signalservice.api.util.UuidUtil;
import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
import org.whispersystems.signalservice.internal.storage.protos.AccountRecord.UsernameLink;
import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
import java.util.Optional;
@ -38,7 +37,8 @@ public final class StorageSyncModels {
public static PhoneNumberSharingMode remoteToLocal(AccountRecord.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
return switch (phoneNumberPhoneNumberSharingMode) {
case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
case UNKNOWN, NOBODY -> PhoneNumberSharingMode.NOBODY;
case NOBODY -> PhoneNumberSharingMode.NOBODY;
case UNKNOWN -> null;
};
}
@ -63,8 +63,9 @@ public final class StorageSyncModels {
.orElse(true))
.setLinkPreviewsEnabled(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
.setUnlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(false))
.setPhoneNumberSharingMode(localToRemote(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
.orElse(PhoneNumberSharingMode.EVERYBODY)))
.setPhoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
.map(StorageSyncModels::localToRemote)
.orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
.setE164(self.getAddress().number().orElse(""))
.setUsername(self.getAddress().username().orElse(null));
if (usernameLinkComponents != null) {
@ -136,7 +137,7 @@ public final class StorageSyncModels {
return SignalStorageRecord.forGroupV2(builder.build());
}
public static TrustLevel remoteToLocal(ContactRecord.IdentityState identityState) {
public static TrustLevel remoteToLocal(IdentityState identityState) {
return switch (identityState) {
case DEFAULT -> TrustLevel.TRUSTED_UNVERIFIED;
case UNVERIFIED -> TrustLevel.UNTRUSTED;