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

Block sends on CDS lookups.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-08-06 10:50:20 -04:00
parent b2d4c5d14b
commit 5923fa0cd5
17 changed files with 85 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -55,8 +55,7 @@ public final class FeatureFlags {
private static final String GROUPS_V2 = "android.groupsv2.2";
private static final String GROUPS_V2_CREATE = "android.groupsv2.create.2";
private static final String GROUPS_V2_CAPACITY = "android.groupsv2.capacity";
private static final String CDS = "android.cds";
private static final String RECIPIENT_TRUST = "android.recipientTrust";
private static final String CDS = "android.cds.2";
private static final String INTERNAL_USER = "android.internalUser";
private static final String MENTIONS = "android.mentions";
@@ -71,7 +70,6 @@ public final class FeatureFlags {
GROUPS_V2,
GROUPS_V2_CREATE,
GROUPS_V2_CAPACITY,
RECIPIENT_TRUST,
INTERNAL_USER,
MENTIONS
);
@@ -95,8 +93,7 @@ public final class FeatureFlags {
*/
private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet(
ATTACHMENTS_V3,
GROUPS_V2_CREATE,
RECIPIENT_TRUST
GROUPS_V2_CREATE
);
/**
@@ -104,8 +101,7 @@ public final class FeatureFlags {
*/
private static final Set<String> STICKY = Sets.newHashSet(
GROUPS_V2,
GROUPS_V2_OLD,
RECIPIENT_TRUST
GROUPS_V2_OLD
);
/**
@@ -174,7 +170,7 @@ public final class FeatureFlags {
Log.i(TAG, "[Disk] After : " + result.getDisk().toString());
}
/** Creating usernames, sending messages by username. Requires {@link #uuidOnlyContacts()}. */
/** Creating usernames, sending messages by username. */
public static synchronized boolean usernames() {
return getBoolean(USERNAMES, false);
}
@@ -218,11 +214,6 @@ public final class FeatureFlags {
return getBoolean(CDS, false);
}
/** Whether or not we allow different trust levels for recipient address sources. */
public static boolean recipientTrust() {
return getBoolean(RECIPIENT_TRUST, false);
}
/** Whether or not we allow mentions send support in groups. */
public static boolean mentions() {
return getBoolean(MENTIONS, false);

2
app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
View File

@@ -68,7 +68,7 @@ public final class ProfileUtil {
@NonNull Recipient recipient,
@NonNull SignalServiceProfile.RequestType requestType)
{
SignalServiceAddress address = RecipientUtil.toSignalServiceAddress(context, recipient);
SignalServiceAddress address = RecipientUtil.toSignalServiceAddressBestEffort(context, recipient);
Optional<UnidentifiedAccess> unidentifiedAccess = getUnidentifiedAccess(context, recipient);
Optional<ProfileKey> profileKey = ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey());