Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 18:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump libsignal-client to 0.2.0

Browse Source
This commit is contained in:
Jack Lloyd
2021-01-06 11:26:45 -05:00
committed by Alan Evans
parent 01152ead61
commit e845fba8b3
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
View File

@@ -60,8 +60,8 @@ public class TextSecureSessionStore implements SessionStore {
SessionRecord sessionRecord = DatabaseFactory.getSessionDatabase(context).load(recipientId, address.getDeviceId());
return sessionRecord != null &&
sessionRecord.getSessionState().hasSenderChain() &&
sessionRecord.getSessionState().getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
sessionRecord.hasSenderChain() &&
sessionRecord.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
} else {
return false;
}

5
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
View File

@@ -10,7 +10,6 @@ import org.signal.core.util.Conversions;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SessionDatabase;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SessionState;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import java.io.File;
@@ -64,9 +63,7 @@ class SessionStoreMigrationHelper {
if (versionMarker == SINGLE_STATE_VERSION) {
Log.i(TAG, "Migrating single state version: " + sessionFile.getAbsolutePath());
SessionState sessionState = new SessionState(serialized);
sessionRecord = new SessionRecord(sessionState);
sessionRecord = SessionRecord.fromSingleSessionState(serialized);
} else if (versionMarker >= ARCHIVE_STATES_VERSION) {
Log.i(TAG, "Migrating session: " + sessionFile.getAbsolutePath());
sessionRecord = new SessionRecord(serialized);