Update libsignal-service

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / Utils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 9d97ed7a44a1c66fc4cd79fff53cb11e8648ac1c..daee1d77edfe750fd8d75ff39f817adc178e4d1a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -7,6 +7,7 @@ import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.NetworkResult;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 
@@ -154,19 +155,7 @@ public class Utils {
     }
 
     public static <T> T handleResponseException(final NetworkResult<T> response) throws IOException {
-        final var throwableOptional = response.getCause();
-        if (throwableOptional != null) {
-            if (throwableOptional instanceof IOException ioException) {
-                throw ioException;
-            } else {
-                throw new IOException(throwableOptional);
-            }
-        }
-        try {
-            return response.successOrThrow();
-        } catch (Throwable e) {
-            throw new AssertionError(e);
-        }
+        return NetworkResultUtil.toBasicLegacy(response);
     }
 
     public static ByteString firstNonEmpty(ByteString... strings) {