diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java index d715482987..4a8a914bbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java @@ -77,9 +77,7 @@ public class TextSecureSessionStore implements SignalServiceSessionStore { try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) { SessionRecord sessionRecord = SignalDatabase.sessions().load(accountId, address); - return sessionRecord != null && - sessionRecord.hasSenderChain() && - sessionRecord.getSessionVersion() == CiphertextMessage.CURRENT_VERSION; + return sessionRecord != null && sessionRecord.hasSenderChain(); } } @@ -168,8 +166,6 @@ public class TextSecureSessionStore implements SignalServiceSessionStore { } private static boolean isActive(@Nullable SessionRecord record) { - return record != null && - record.hasSenderChain() && - record.getSessionVersion() == CiphertextMessage.CURRENT_VERSION; + return record != null && record.hasSenderChain(); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSessionStore.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSessionStore.kt index 7f15a9b845..fb414cb19c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSessionStore.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSessionStore.kt @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.messages.protocol import org.signal.libsignal.protocol.NoSessionException import org.signal.libsignal.protocol.SignalProtocolAddress -import org.signal.libsignal.protocol.message.CiphertextMessage import org.signal.libsignal.protocol.state.SessionRecord import org.thoughtcrime.securesms.database.SignalDatabase import org.whispersystems.signalservice.api.SignalServiceAccountDataStore @@ -72,7 +71,7 @@ class BufferedSessionStore(private val selfServiceId: ServiceId) : SignalService if (fromDatabase != null) { store[address] = fromDatabase - return fromDatabase.hasSenderChain() && fromDatabase.sessionVersion == CiphertextMessage.CURRENT_VERSION + return fromDatabase.hasSenderChain() } else { false } diff --git a/microbenchmark/src/androidTest/java/org/signal/util/InMemorySignalServiceAccountDataStore.kt b/microbenchmark/src/androidTest/java/org/signal/util/InMemorySignalServiceAccountDataStore.kt index 9beec9f1fd..4840508cdc 100644 --- a/microbenchmark/src/androidTest/java/org/signal/util/InMemorySignalServiceAccountDataStore.kt +++ b/microbenchmark/src/androidTest/java/org/signal/util/InMemorySignalServiceAccountDataStore.kt @@ -4,7 +4,6 @@ import org.signal.libsignal.protocol.IdentityKey import org.signal.libsignal.protocol.IdentityKeyPair import org.signal.libsignal.protocol.SignalProtocolAddress import org.signal.libsignal.protocol.groups.state.SenderKeyRecord -import org.signal.libsignal.protocol.message.CiphertextMessage import org.signal.libsignal.protocol.state.IdentityKeyStore import org.signal.libsignal.protocol.state.PreKeyRecord import org.signal.libsignal.protocol.state.SessionRecord @@ -150,7 +149,7 @@ class InMemorySignalServiceAccountDataStore : SignalServiceAccountDataStore { } private fun SessionRecord.isValid(): Boolean { - return this.hasSenderChain() && this.sessionVersion == CiphertextMessage.CURRENT_VERSION + return this.hasSenderChain() } private data class SenderKeyLocator(val address: SignalProtocolAddress, val distributionId: UUID)