Skip to content

Commit c4131bb

Browse files
greyson-signalcody-signal
authored andcommitted
Inline the attachment backfill flag.
1 parent 0dfe71c commit c4131bb

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.thoughtcrime.securesms
22

3-
import org.thoughtcrime.securesms.util.RemoteConfig
43
import org.whispersystems.signalservice.api.account.AccountAttributes
54

65
object AppCapabilities {
@@ -15,7 +14,7 @@ object AppCapabilities {
1514
deleteSync = true,
1615
versionedExpirationTimer = true,
1716
storageServiceEncryptionV2 = true,
18-
attachmentBackfill = RemoteConfig.attachmentBackfillSync
17+
attachmentBackfill = true
1918
)
2019
}
2120
}

app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ import org.thoughtcrime.securesms.util.EarlyMessageCacheEntry
9898
import org.thoughtcrime.securesms.util.IdentityUtil
9999
import org.thoughtcrime.securesms.util.MediaUtil
100100
import org.thoughtcrime.securesms.util.MessageConstraintsUtil
101-
import org.thoughtcrime.securesms.util.RemoteConfig
102101
import org.thoughtcrime.securesms.util.SignalE164Util
103102
import org.thoughtcrime.securesms.util.TextSecurePreferences
104103
import org.thoughtcrime.securesms.util.Util
@@ -1655,11 +1654,6 @@ object SyncMessageProcessor {
16551654
}
16561655

16571656
private fun handleSynchronizeAttachmentBackfillRequest(request: SyncMessage.AttachmentBackfillRequest, timestamp: Long) {
1658-
if (!RemoteConfig.attachmentBackfillSync) {
1659-
warn(timestamp, "[AttachmentBackfillRequest] Remote config not enabled! Skipping.")
1660-
return
1661-
}
1662-
16631657
if (request.targetMessage == null || request.targetConversation == null) {
16641658
warn(timestamp, "[AttachmentBackfillRequest] Target message or target conversation was unset! Can't formulate a response, ignoring.")
16651659
return

app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,13 +1107,6 @@ object RemoteConfig {
11071107
hotSwappable = false
11081108
)
11091109

1110-
/** Whether or not this device respect attachment backfill requests. */
1111-
val attachmentBackfillSync: Boolean by remoteBoolean(
1112-
key = "android.attachmentBackfillSync",
1113-
defaultValue = false,
1114-
hotSwappable = true
1115-
)
1116-
11171110
/** Whether or not libsignal-net's CDSI lookups use the new route-based internals or the old ones */
11181111
val libsignalRouteBasedCDSILookup: Boolean by remoteBoolean(
11191112
key = "android.libsignal.libsignalRouteBasedCDSILookup",

0 commit comments

Comments
 (0)