From 216073f4c29ef1eb93564822d2399c437eeb2e63 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 30 Aug 2024 16:18:23 -0400 Subject: [PATCH] Fix versioned expiration timer capability bug. --- .../java/org/thoughtcrime/securesms/AppCapabilities.kt | 2 +- .../securesms/migrations/ApplicationMigrations.java | 7 ++++++- .../signalservice/api/account/AccountAttributes.kt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt index 54ca7cdc87..e8cde2434f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt @@ -12,7 +12,7 @@ object AppCapabilities { return AccountAttributes.Capabilities( storage = storageCapable, deleteSync = true, - expireTimerVersion = true + versionedExpirationTimer = true ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java index 65f8e57dcd..f016677a82 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java @@ -153,9 +153,10 @@ public class ApplicationMigrations { static final int REBUILD_MESSAGE_FTS_INDEX_5 = 108; static final int EXPIRE_TIMER_CAPABILITY = 109; static final int REBUILD_MESSAGE_FTS_INDEX_6 = 110; + static final int EXPIRE_TIMER_CAPABILITY_2 = 111; } - public static final int CURRENT_VERSION = 110; + public static final int CURRENT_VERSION = 111; /** * This *must* be called after the {@link JobManager} has been instantiated, but *before* the call @@ -698,6 +699,10 @@ public class ApplicationMigrations { jobs.put(Version.REBUILD_MESSAGE_FTS_INDEX_6, new RebuildMessageSearchIndexMigrationJob()); } + if (lastSeenVersion < Version.EXPIRE_TIMER_CAPABILITY_2) { + jobs.put(Version.EXPIRE_TIMER_CAPABILITY_2, new AttributesMigrationJob()); + } + return jobs; } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt index fa89e9a61f..b578e56753 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt @@ -56,6 +56,6 @@ class AccountAttributes @JsonCreator constructor( data class Capabilities @JsonCreator constructor( @JsonProperty val storage: Boolean, @JsonProperty val deleteSync: Boolean, - @JsonProperty val expireTimerVersion: Boolean + @JsonProperty val versionedExpirationTimer: Boolean ) }