Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve logging and the naming of some fields.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-01-12 14:43:22 -05:00
parent 64fff2adb2
commit e361795184
12 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,9 +9,9 @@ import java.util.List;
public final class PhoneNumberPrivacyValues extends SignalStoreValues {
public static final String SHARING_MODE = "phoneNumberPrivacy.sharingMode";
public static final String LISTING_MODE = "phoneNumberPrivacy.listingMode";
public static final String LISTING_TIMESTAMP = "phoneNumberPrivacy.listingMode.timestamp";
public static final String SHARING_MODE = "phoneNumberPrivacy.sharingMode";
public static final String DISCOVERABILITY_MODE = "phoneNumberPrivacy.listingMode";
public static final String DISCOVERABILITY_TIMESTAMP = "phoneNumberPrivacy.listingMode.timestamp";
private static final Collection<CertificateType> ACI_AND_E164_CERTIFICATE = Collections.singletonList(CertificateType.ACI_AND_E164);
private static final Collection<CertificateType> ACI_ONLY_CERTIFICATE = Collections.singletonList(CertificateType.ACI_ONLY);
@@ -31,7 +31,7 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
@Override
@NonNull List<String> getKeysToIncludeInBackup() {
return Arrays.asList(SHARING_MODE, LISTING_MODE, LISTING_TIMESTAMP);
return Arrays.asList(SHARING_MODE, DISCOVERABILITY_MODE, DISCOVERABILITY_TIMESTAMP);
}
/**
@@ -55,23 +55,23 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
}
public boolean isDiscoverableByPhoneNumber() {
return getPhoneNumberListingMode() == PhoneNumberPrivacyValues.PhoneNumberListingMode.LISTED;
return getPhoneNumberDiscoverabilityMode() == PhoneNumberDiscoverabilityMode.DISCOVERABLE;
}
public @NonNull PhoneNumberListingMode getPhoneNumberListingMode() {
return PhoneNumberListingMode.deserialize(getInteger(LISTING_MODE, PhoneNumberListingMode.LISTED.serialize()));
public @NonNull PhoneNumberDiscoverabilityMode getPhoneNumberDiscoverabilityMode() {
return PhoneNumberDiscoverabilityMode.deserialize(getInteger(DISCOVERABILITY_MODE, PhoneNumberDiscoverabilityMode.DISCOVERABLE.serialize()));
}
public void setPhoneNumberListingMode(@NonNull PhoneNumberListingMode phoneNumberListingMode) {
public void setPhoneNumberDiscoverabilityMode(@NonNull PhoneNumberDiscoverabilityMode phoneNumberDiscoverabilityMode) {
getStore()
.beginWrite()
.putInteger(LISTING_MODE, phoneNumberListingMode.serialize())
.putLong(LISTING_TIMESTAMP, System.currentTimeMillis())
.putInteger(DISCOVERABILITY_MODE, phoneNumberDiscoverabilityMode.serialize())
.putLong(DISCOVERABILITY_TIMESTAMP, System.currentTimeMillis())
.apply();
}
public long getPhoneNumberListingModeTimestamp() {
return getLong(LISTING_TIMESTAMP, 0);
public long getPhoneNumberDiscoverabilityModeTimestamp() {
return getLong(DISCOVERABILITY_TIMESTAMP, 0);
}
/**
@@ -119,30 +119,30 @@ public final class PhoneNumberPrivacyValues extends SignalStoreValues {
}
}
public enum PhoneNumberListingMode {
LISTED(0),
UNLISTED(1);
public enum PhoneNumberDiscoverabilityMode {
DISCOVERABLE(0),
NOT_DISCOVERABLE(1);
private final int code;
PhoneNumberListingMode(int code) {
PhoneNumberDiscoverabilityMode(int code) {
this.code = code;
}
public boolean isDiscoverable() {
return this == LISTED;
return this == DISCOVERABLE;
}
public boolean isUnlisted() {
return this == UNLISTED;
public boolean isUndiscoverable() {
return this == NOT_DISCOVERABLE;
}
public int serialize() {
return code;
}
public static PhoneNumberListingMode deserialize(int code) {
for (PhoneNumberListingMode value : PhoneNumberListingMode.values()) {
public static PhoneNumberDiscoverabilityMode deserialize(int code) {
for (PhoneNumberDiscoverabilityMode value : PhoneNumberDiscoverabilityMode.values()) {
if (value.code == code) {
return value;
}