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

Rename the UUID flag to be more explicit.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-07-05 14:57:11 -07:00
parent 9ac142688a
commit 5605fde777
7 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@ public class Recipient {
} else if (!recipient.isRegistered()) {
db.markRegistered(recipient.getId());
if (FeatureFlags.uuids()) {
if (FeatureFlags.cds()) {
Log.i(TAG, "No UUID! Scheduling a fetch.");
ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(recipient, false));
}
@@ -187,7 +187,7 @@ public class Recipient {
return resolved(recipient.getId());
} else if (uuid != null) {
if (FeatureFlags.uuids() || e164 != null) {
if (FeatureFlags.uuidOnlyContacts() || e164 != null) {
RecipientId id = db.getOrInsertFromUuid(uuid);
db.markRegistered(id, uuid);
@@ -197,7 +197,7 @@ public class Recipient {
return resolved(id);
} else {
if (!FeatureFlags.uuids() && FeatureFlags.groupsV2()) {
if (!FeatureFlags.uuidOnlyContacts() && FeatureFlags.groupsV2()) {
throw new RuntimeException(new UuidRecipientError());
} else {
throw new UuidRecipientError();
@@ -209,7 +209,7 @@ public class Recipient {
if (!recipient.isRegistered()) {
db.markRegistered(recipient.getId());
if (FeatureFlags.uuids()) {
if (FeatureFlags.cds()) {
Log.i(TAG, "No UUID! Scheduling a fetch.");
ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(recipient, false));
}
@@ -272,7 +272,7 @@ public class Recipient {
if (UuidUtil.isUuid(identifier)) {
UUID uuid = UuidUtil.parseOrThrow(identifier);
if (FeatureFlags.uuids()) {
if (FeatureFlags.uuidOnlyContacts()) {
id = db.getOrInsertFromUuid(uuid);
} else {
Optional<RecipientId> possibleId = db.getByUuid(uuid);
@@ -280,7 +280,7 @@ public class Recipient {
if (possibleId.isPresent()) {
id = possibleId.get();
} else {
if (!FeatureFlags.uuids() && FeatureFlags.groupsV2()) {
if (!FeatureFlags.uuidOnlyContacts() && FeatureFlags.groupsV2()) {
throw new RuntimeException(new UuidRecipientError());
} else {
throw new UuidRecipientError();
@@ -754,7 +754,7 @@ public class Recipient {
if (FeatureFlags.usernames()) {
return true;
} else {
return FeatureFlags.uuids() && uuidCapability == Capability.SUPPORTED;
return FeatureFlags.uuidOnlyContacts() && uuidCapability == Capability.SUPPORTED;
}
}

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

@@ -46,7 +46,7 @@ public class RecipientUtil {
throw new AssertionError(recipient.getId() + " - No UUID or phone number!");
}
if (FeatureFlags.uuids() && !recipient.getUuid().isPresent()) {
if (FeatureFlags.cds() && !recipient.getUuid().isPresent()) {
Log.i(TAG, recipient.getId() + " is missing a UUID...");
try {
RegisteredState state = DirectoryHelper.refreshDirectoryFor(context, recipient, false);