From 9d696c8a5fd0960644059a656e6fa29fcc3acb43 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 13 Jun 2023 22:09:04 +0200
Subject: [PATCH] set proxy w/ createUnresolved() to avoid
 NetworkOnMainThreadException

closes acra-crash-reports#190
---
 app/src/main/java/org/fdroid/fdroid/FDroidApp.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index 1bd3b2699..131e015fa 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -79,6 +79,8 @@ import org.fdroid.index.IndexFormatVersion;
 import org.fdroid.index.RepoManager;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.nio.ByteBuffer;
 import java.security.Security;
 import java.util.List;
@@ -489,7 +491,10 @@ public class FDroidApp extends Application implements androidx.work.Configuratio
         if (preferences.isTorEnabled()) {
             NetCipher.useTor();
         } else if (preferences.isProxyEnabled()) {
-            NetCipher.setProxy(preferences.getProxyHost(), preferences.getProxyPort());
+            // TODO move createUnresolved to NetCipher itself once its proven
+            InetSocketAddress isa = InetSocketAddress.createUnresolved(
+                    preferences.getProxyHost(), preferences.getProxyPort());
+            NetCipher.setProxy(new Proxy(Proxy.Type.HTTP, isa));
         } else {
             NetCipher.clearProxy();
         }