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

Remove edit message receive feature flag.

Browse Source
This commit is contained in:
Cody Henthorne
2023-06-15 12:23:35 -04:00
parent b1523f5b91
commit 6cc41e95c6
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessorV2.kt
View File

@@ -415,19 +415,15 @@ open class MessageContentProcessorV2(private val context: Context) {
handleRetryReceipt(envelope, metadata, content.decryptionErrorMessage!!.toDecryptionErrorMessage(metadata), senderRecipient)
}
content.hasEditMessage() -> {
if (FeatureFlags.editMessageReceiving()) {
EditMessageProcessor.process(
context,
senderRecipient,
threadRecipient,
envelope,
content,
metadata,
if (processingEarlyContent) null else EarlyMessageCacheEntry(envelope, content, metadata, serverDeliveredTimestamp)
)
} else {
warn(envelope.timestamp, "Got message edit, but processing is disabled")
}
EditMessageProcessor.process(
context,
senderRecipient,
threadRecipient,
envelope,
content,
metadata,
if (processingEarlyContent) null else EarlyMessageCacheEntry(envelope, content, metadata, serverDeliveredTimestamp)
)
}
content.hasSenderKeyDistributionMessage() || content.hasPniSignatureMessage() -> {
// Already handled, here in order to prevent unrecognized message log

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

@@ -105,7 +105,6 @@ public final class FeatureFlags {
private static final String TEXT_FORMATTING = "android.textFormatting.3";
private static final String ANY_ADDRESS_PORTS_KILL_SWITCH = "android.calling.fieldTrial.anyAddressPortsKillSwitch";
private static final String AD_HOC_CALLING = "android.calling.ad.hoc.2";
private static final String EDIT_MESSAGE_RECEIVE = "android.editMessage.receive.2";
private static final String EDIT_MESSAGE_SEND = "android.editMessage.send.2";
private static final String MAX_ATTACHMENT_COUNT = "android.attachments.maxCount";
private static final String MAX_ATTACHMENT_SIZE_MB = "android.attachments.maxSize";
@@ -166,7 +165,6 @@ public final class FeatureFlags {
PAYPAL_RECURRING_DONATIONS,
TEXT_FORMATTING,
ANY_ADDRESS_PORTS_KILL_SWITCH,
EDIT_MESSAGE_RECEIVE,
EDIT_MESSAGE_SEND,
MAX_ATTACHMENT_COUNT,
MAX_ATTACHMENT_SIZE_MB,
@@ -234,7 +232,6 @@ public final class FeatureFlags {
PAYMENTS_REQUEST_ACTIVATE_FLOW,
CDS_HARD_LIMIT,
TEXT_FORMATTING,
EDIT_MESSAGE_RECEIVE,
EDIT_MESSAGE_SEND,
MAX_ATTACHMENT_COUNT,
MAX_ATTACHMENT_SIZE_MB
@@ -591,10 +588,6 @@ public final class FeatureFlags {
return getBoolean(ANY_ADDRESS_PORTS_KILL_SWITCH, false);
}
public static boolean editMessageReceiving() {
return getBoolean(EDIT_MESSAGE_RECEIVE, false);
}
public static boolean editMessageSending() {
return getBoolean(EDIT_MESSAGE_SEND, false);
}