From 4afb459b30920a7cfce375713a985a2613f8a831 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 12 Feb 2021 15:03:37 -0500
Subject: [PATCH] Revert "Bump libsignal-client to 0.2.3"

This reverts commit 8b7506ed2defbf71333b5077852630a2fa11d088.
---
 app/build.gradle                                          | 2 +-
 .../securesms/crypto/storage/TextSecureSessionStore.java  | 4 ++--
 .../database/helpers/SessionStoreMigrationHelper.java     | 5 ++++-
 app/witness-verifications.gradle                          | 8 ++++----
 libsignal/service/build.gradle                            | 2 +-
 libsignal/service/witness-verifications.gradle            | 4 ++--
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4626981308..a958bdb58b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -335,7 +335,7 @@ dependencies {
     implementation project(':video')
 
     implementation 'org.signal:zkgroup-android:0.7.0'
-    implementation 'org.whispersystems:signal-client-android:0.2.3'
+    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'
 
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 267c02f805..f06edd332f 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
@@ -60,8 +60,8 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
         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;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
index db106c45b9..6fcec92c8e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
@@ -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);
diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
index 053e90bd55..6544d83e2d 100644
--- a/app/witness-verifications.gradle
+++ b/app/witness-verifications.gradle
@@ -426,11 +426,11 @@ dependencyVerification {
         ['org.threeten:threetenbp:1.3.6',
          'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
 
-        ['org.whispersystems:signal-client-android:0.2.3',
-         '21e7bd8cc80559ee064e2acf7b9d091155c6b511e8b186fa1310267a5ab50e5c'],
+        ['org.whispersystems:signal-client-android:0.1.5',
+         'a95f4d8125a22552da99b5db15589454789eee322e84d9ba613c258150366a64'],
 
-        ['org.whispersystems:signal-client-java:0.2.3',
-         '6d3648e0cb9e22a921198f853a4886bdbaed26a4c52accf559618d75c2189b89'],
+        ['org.whispersystems:signal-client-java:0.1.5',
+         'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
 
         ['pl.tajchert:waitingdots:0.1.0',
          '2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c'],
diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle
index a9ede8d1c5..5a4d9afbf0 100644
--- a/libsignal/service/build.gradle
+++ b/libsignal/service/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     api 'com.googlecode.libphonenumber:libphonenumber:8.12.17'
     api 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
 
-    api 'org.whispersystems:signal-client-java:0.2.3'
+    api 'org.whispersystems:signal-client-java:0.1.5'
     api 'com.squareup.okhttp3:okhttp:3.12.10'
     implementation 'org.threeten:threetenbp:1.3.6'
 
diff --git a/libsignal/service/witness-verifications.gradle b/libsignal/service/witness-verifications.gradle
index 3a486939ca..dde8f02b94 100644
--- a/libsignal/service/witness-verifications.gradle
+++ b/libsignal/service/witness-verifications.gradle
@@ -30,7 +30,7 @@ dependencyVerification {
         ['org.threeten:threetenbp:1.3.6',
          'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
 
-        ['org.whispersystems:signal-client-java:0.2.3',
-         '6d3648e0cb9e22a921198f853a4886bdbaed26a4c52accf559618d75c2189b89'],
+        ['org.whispersystems:signal-client-java:0.1.5',
+         'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
     ]
 }