From f5173fa6f5933e1226738ae6c3b13ef750362975 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 22 Apr 2022 07:53:03 -0400
Subject: [PATCH] Update libsignal-client to 0.16.0

---
 dependencies.gradle                              |  2 +-
 gradle/verification-metadata.xml                 | 16 ++++++++++++++++
 .../api/groupsv2/ClientZkOperations.java         |  7 ++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 49c5464a2c..a79e82a383 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -4,7 +4,7 @@
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('libsignal-client', '0.15.0')
+            version('libsignal-client', '0.16.0')
             version('exoplayer', '2.15.0')
             version('androidx-camera', '1.0.0-beta11')
             version('androidx-lifecycle', '2.3.1')
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 695e3513f6..2f20b0ce8a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3602,6 +3602,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e0ad9cb0073a699fce187d527bb1d423a9082fb7a2f75e1fbf89fef6fb880cec" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.signal" name="libsignal-android" version="0.16.0">
+         <artifact name="libsignal-android-0.16.0.aar">
+            <sha256 value="83837fbcfac5df7ace3d5a862c8d1764d8d5fe115fb4ba7199c409ad56e01bd6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="libsignal-android-0.16.0.module">
+            <sha256 value="901ff8ffa807043df7fec86d3192c2160b02e3c89cbd25aa448ce9b317bcfa1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.signal" name="libsignal-client" version="0.15.0">
          <artifact name="libsignal-client-0.15.0.jar">
             <sha256 value="dfbd132106ef6dbd4355043355a47132874bccbf0d42c85350686013084b953c" origin="Generated by Gradle"/>
@@ -3610,6 +3618,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="76625d04c538f791275cb34870ed7805c09fb3a6f3deb3a256e13a48ef440fde" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.signal" name="libsignal-client" version="0.16.0">
+         <artifact name="libsignal-client-0.16.0.jar">
+            <sha256 value="9c81c50e7438ef6e8eeba3bfffe7b80cdcdec91f819e712f19a43c5a47381041" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="libsignal-client-0.16.0.module">
+            <sha256 value="bf168abaea7fd2eeeec558e5f7012d01da786e08467c9c0ac68c177b1fd48ee9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.signal" name="ringrtc-android" version="2.19.2">
          <artifact name="ringrtc-android-2.19.2.aar">
             <sha256 value="5d141ab9dc605d59b071e52ab36112ee319ec6c11a81835d47b7a0581ce245e7" origin="Generated by Gradle"/>
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java
index f131b5aec0..2d8151bec8 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java
@@ -1,5 +1,6 @@
 package org.whispersystems.signalservice.api.groupsv2;
 
+import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.ServerPublicParams;
 import org.signal.libsignal.zkgroup.auth.ClientZkAuthOperations;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
@@ -26,7 +27,11 @@ public final class ClientZkOperations {
   }
 
   public static ClientZkOperations create(SignalServiceConfiguration configuration) {
-    return new ClientZkOperations(new ServerPublicParams(configuration.getZkGroupServerPublicParams()));
+    try {
+      return new ClientZkOperations(new ServerPublicParams(configuration.getZkGroupServerPublicParams()));
+    } catch (InvalidInputException e) {
+      throw new AssertionError(e);
+    }
   }
 
   public ClientZkAuthOperations getAuthOperations() {