From d2d698f64eae695dd7b4a2d6686ada54ec79a941 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@signal.org>
Date: Thu, 10 Dec 2020 10:23:13 -0500
Subject: [PATCH] Don't rely on the SessionState protobuf.

Instead use the convenient deserialization constructor
---
 .../database/helpers/SessionStoreMigrationHelper.java         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 62fcaa76f..6fcec92c8 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
@@ -11,7 +11,6 @@ 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.libsignal.state.StorageProtos.SessionStructure;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.File;
@@ -65,8 +64,7 @@ class SessionStoreMigrationHelper {
 
             if (versionMarker == SINGLE_STATE_VERSION) {
               Log.i(TAG, "Migrating single state version: " + sessionFile.getAbsolutePath());
-              SessionStructure sessionStructure = SessionStructure.parseFrom(serialized);
-              SessionState     sessionState     = new SessionState(sessionStructure);
+              SessionState sessionState = new SessionState(serialized);
 
               sessionRecord = new SessionRecord(sessionState);
             } else if (versionMarker >= ARCHIVE_STATES_VERSION) {