transform aesgcm:// links back to https:// before connecting through Tor

1 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java
index 06fda4163..d15f4bef5 100644
--- a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java
@@ -29,6 +29,7 @@ import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.http.AesGcmURLStreamHandler;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 
@@ -238,7 +239,18 @@ public final class CryptoHelper {
             return url;
         }
         try {
-            return new URL("aesgcm" + url.toString().substring(url.getProtocol().length()));
+            return new URL(AesGcmURLStreamHandler.PROTOCOL_NAME + url.toString().substring(url.getProtocol().length()));
+        } catch (MalformedURLException e) {
+            return url;
+        }
+    }
+
+    public static URL toHttpsUrl(URL url) {
+        if (!url.getProtocol().equalsIgnoreCase(AesGcmURLStreamHandler.PROTOCOL_NAME)) {
+            return url;
+        }
+        try {
+            return new URL("https" + url.toString().substring(url.getProtocol().length()));
         } catch (MalformedURLException e) {
             return url;
         }