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

Remove unnecessary validation check.

Browse source
This commit is contained in:
Greyson Parrelli 2023-05-22 17:47:24 -04:00 • committed by Nicholas
parent 0817f113c6
commit ad50c81a6b
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
View file

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

3
app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSessionStore.kt
View file

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

3
microbenchmark/src/androidTest/java/org/signal/util/InMemorySignalServiceAccountDataStore.kt
View file

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