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 945b2756872dd11970b06da6b6f45e967c514943..9d97ed7a44a1c66fc4cd79fff53cb11e8648ac1c 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
@@ -15,6 +15,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -158,7 +162,11 @@ public class Utils {
                 throw new IOException(throwableOptional);
             }
         }
-        return response.successOrThrow();
+        try {
+            return response.successOrThrow();
+        } catch (Throwable e) {
+            throw new AssertionError(e);
+        }
     }
 
     public static ByteString firstNonEmpty(ByteString... strings) {
@@ -202,4 +210,19 @@ public class Utils {
     public static String nullIfEmpty(String string) {
         return string == null || string.isEmpty() ? null : string;
     }
+
+    public static Proxy getHttpsProxy() {
+        final URI uri;
+        try {
+            uri = new URI("https://example");
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+        final var proxies = ProxySelector.getDefault().select(uri);
+        if (proxies.isEmpty()) {
+            return Proxy.NO_PROXY;
+        } else {
+            return proxies.getFirst();
+        }
+    }
 }