Prevent proxy bypass when Tor port is not yet available

mollyim · Apr 6, 2022 · 1b91d48 · 1b91d48
1 parent 826bbe2
commit 1b91d48
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/Network.kt b/app/src/main/java/org/thoughtcrime/securesms/net/Network.kt
@@ -27,7 +27,11 @@ object Network {
   @JvmStatic
   val proxy
     get(): Proxy? {
-      return socksProxy?.makeProxy() ?: Proxy.NO_PROXY
+      if (socksProxy != null) {
+        return socksProxy?.makeProxy()
+      } else {
+        return Proxy.NO_PROXY
+      }
     }
 
   @JvmStatic