From 9b5387e221fc623c4453b163a6ef34cd70eb25d6 Mon Sep 17 00:00:00 2001
From: moiseev-signal <122060238+moiseev-signal@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:20:27 -0700
Subject: [PATCH] Upgrade to libsignal 0.45.0

---
 dependencies.gradle.kts                       |  2 +-
 gradle/verification-metadata.xml              | 20 +++++++++----------
 .../signalservice/api/archive/ArchiveApi.kt   |  5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index 23258f7a48..0207db190e 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
       version("exoplayer", "2.19.0")
       version("glide", "4.15.1")
       version("kotlin", "1.8.10")
-      version("libsignal-client", "0.44.0")
+      version("libsignal-client", "0.45.0")
       version("mp4parser", "1.9.39")
       version("android-gradle-plugin", "8.0.2")
       version("accompanist", "0.28.0")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4b88b89e2f..1d268cb668 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -5703,20 +5703,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6eb4422e8a618b3b76cb2096a3619d251f9e27989dc68307a1e5414c3710f2d1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-android" version="0.44.0">
-         <artifact name="libsignal-android-0.44.0.aar">
-            <sha256 value="305c356426fa6a69431dd671ef4d6241139f34471df9a69bc43a5250e404bf23" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-android" version="0.45.0">
+         <artifact name="libsignal-android-0.45.0.aar">
+            <sha256 value="7e7084354c4071d46de2c0cfb14eeb5b355d22bce6af23fbddf3ca9f57f2bc09" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-android-0.44.0.module">
-            <sha256 value="16a202170f9c152a971a7077034261e0ca96f8351631fbfe1109afb8db8f7c91" origin="Generated by Gradle"/>
+         <artifact name="libsignal-android-0.45.0.module">
+            <sha256 value="3442ab628197ad82fa70963f636018534b8ebc052c96746ff6dfcb99d7044aad" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-client" version="0.44.0">
-         <artifact name="libsignal-client-0.44.0.jar">
-            <sha256 value="4a572e1288f1509b898f7080dc52c3f575396ec05ec12e7014a8b52a37f2f434" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-client" version="0.45.0">
+         <artifact name="libsignal-client-0.45.0.jar">
+            <sha256 value="3da755e288edf6e0e0d119d58b6774d102e6bb9d8f59a2d8be7e3f23fd3120eb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-client-0.44.0.module">
-            <sha256 value="21ad4954266610b8171e8b146d5be428543427b1466f81749c0c9f52a40e393d" origin="Generated by Gradle"/>
+         <artifact name="libsignal-client-0.45.0.module">
+            <sha256 value="5393570852dae07eefe50212dfbde23d81fef17698802d36caa43b11b15d88d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.signal" name="ringrtc-android" version="2.40.0">
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt
index e66596915b..54aba96445 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt
@@ -18,6 +18,7 @@ import org.whispersystems.signalservice.api.backup.BackupKey
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import java.io.InputStream
+import java.time.Instant
 
 /**
  * Class to interact with various archive-related endpoints.
@@ -238,8 +239,8 @@ class ArchiveApi(
 
     return backupRequestContext.receiveResponse(
       backupAuthResponse,
-      backupServerPublicParams,
-      201
+      Instant.ofEpochMilli(serviceCredential.redemptionTime),
+      backupServerPublicParams
     )
   }