empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix versioned expiration timer capability bug.

Browse source
This commit is contained in:
Cody Henthorne 2024-08-30 16:18:23 -04:00
parent 84ae8db549
commit 216073f4c2
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
View file

@ -12,7 +12,7 @@ object AppCapabilities {
return AccountAttributes.Capabilities(
storage = storageCapable,
deleteSync = true,
expireTimerVersion = true
versionedExpirationTimer = true
)
}
}

7
app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
View file

@ -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;
}

2
libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
View file

@ -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
)
}