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

Revert "Bump libsignal-client to 0.2.0"

Browse source 
This reverts commit e845fba8b3.
This commit is contained in:
Alan Evans 2021-01-07 15:09:25 -04:00
parent 25af25cd19
commit dda68d6c95
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -340,7 +340,7 @@ dependencies {
implementation project(':video')
implementation 'org.signal:zkgroup-android:0.7.0'
implementation 'org.whispersystems:signal-client-android:0.2.0'
implementation 'org.whispersystems:signal-client-android:0.1.5'
implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
implementation 'org.signal:argon2:13.1@aar'

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.hasSenderChain() &&
sessionRecord.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
sessionRecord.getSessionState().hasSenderChain() &&
sessionRecord.getSessionState().getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
} else {
return false;
}

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

@ -10,6 +10,7 @@ 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;
@ -63,7 +64,9 @@ class SessionStoreMigrationHelper {
if (versionMarker == SINGLE_STATE_VERSION) {
Log.i(TAG, "Migrating single state version: " + sessionFile.getAbsolutePath());
sessionRecord = SessionRecord.fromSingleSessionState(serialized);
SessionState sessionState = new SessionState(serialized);
sessionRecord = new SessionRecord(sessionState);
} else if (versionMarker >= ARCHIVE_STATES_VERSION) {
Log.i(TAG, "Migrating session: " + sessionFile.getAbsolutePath());
sessionRecord = new SessionRecord(serialized);

8
app/witness-verifications.gradle
View file

@ -456,11 +456,11 @@ dependencyVerification {
['org.threeten:threetenbp:1.3.6',
'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
['org.whispersystems:signal-client-android:0.2.0',
'e019c71775d1d711b35141dd0a6af18dc9edf7dc1fddba78702f0f96ca9d0a06'],
['org.whispersystems:signal-client-android:0.1.5',
'a95f4d8125a22552da99b5db15589454789eee322e84d9ba613c258150366a64'],
['org.whispersystems:signal-client-java:0.2.0',
'b7f9cea01885d205b55f0ff313423c52424b293a433de02a62f78bcd0c60aeb2'],
['org.whispersystems:signal-client-java:0.1.5',
'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
['pl.tajchert:waitingdots:0.1.0',
'2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c'],

2
libsignal/service/build.gradle
View file

@ -21,7 +21,7 @@ dependencies {
api 'com.googlecode.libphonenumber:libphonenumber:8.12.6'
api 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
api 'org.whispersystems:signal-client-java:0.2.0'
api 'org.whispersystems:signal-client-java:0.1.4'
api 'com.squareup.okhttp3:okhttp:3.12.10'
implementation 'org.threeten:threetenbp:1.3.6'

4
libsignal/service/witness-verifications.gradle
View file

@ -30,7 +30,7 @@ dependencyVerification {
['org.threeten:threetenbp:1.3.6',
'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
['org.whispersystems:signal-client-java:0.2.0',
'b7f9cea01885d205b55f0ff313423c52424b293a433de02a62f78bcd0c60aeb2'],
['org.whispersystems:signal-client-java:0.1.4',
'7d151220a203e43ecf419256eecb6309cc4c5644557beeb29f54ba34ee82645c'],
]
}