Use the user's proxy settings for all network connections

Author: DenWav

src/main/kotlin/com/demonwav/mcdev/creator/PlatformVersion.kt

@@ -11,11 +11,11 @@
 package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.platform.PlatformType
+import com.demonwav.mcdev.util.ProxyHttpConnectionFactory
 import com.demonwav.mcdev.util.fromJson
 import com.demonwav.mcdev.util.gson
 import org.jetbrains.concurrency.runAsync
 import java.io.IOException
-import java.net.URL
 import java.util.Arrays
 import java.util.Objects
 import javax.swing.JComboBox
@@ -36,13 +36,14 @@ fun getVersionSelector(type: PlatformType) = runAsync {
 }
 
 private fun doCall(urlText: String): PlatformVersion {
-    val url = URL(urlText)
-    val connection = url.openConnection()
+    val connection = ProxyHttpConnectionFactory.openHttpConnection(urlText)
+
     connection.setRequestProperty(
         "User-Agent",
         "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9.2.2) Gecko/20100316 Firefox/3.6.2"
     )
-    val text = connection.getInputStream().use { it.reader().use { it.readText() } }
+
+    val text = connection.inputStream.use { stream -> stream.reader().use { it.readText() } }
     return gson.fromJson(text)
 }
 

src/main/kotlin/com/demonwav/mcdev/error/AnonymousFeedback.kt

@@ -11,14 +11,14 @@
 package com.demonwav.mcdev.error
 
 import com.demonwav.mcdev.update.PluginUtil
+import com.demonwav.mcdev.util.HttpConnectionFactory
 import com.demonwav.mcdev.util.fromJson
 import com.demonwav.mcdev.util.gson
 import com.intellij.ide.plugins.PluginManager
 import com.intellij.util.io.readCharSequence
 import org.apache.commons.io.IOUtils
 import java.io.InputStreamReader
 import java.net.HttpURLConnection
-import java.net.URL
 
 object AnonymousFeedback {
 
@@ -230,8 +230,4 @@ object AnonymousFeedback {
         }
         agent
     }
-
-    open class HttpConnectionFactory {
-        open fun openHttpConnection(url: String) = URL(url).openConnection() as HttpURLConnection
-    }
 }

src/main/kotlin/com/demonwav/mcdev/error/AnonymousFeedbackTask.kt

@@ -10,10 +10,10 @@
 
 package com.demonwav.mcdev.error
 
+import com.demonwav.mcdev.util.ProxyHttpConnectionFactory
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
-import com.intellij.util.net.HttpConfigurable
 
 class AnonymousFeedbackTask(
     project: Project?,
@@ -28,14 +28,10 @@ class AnonymousFeedbackTask(
         indicator.isIndeterminate = true
 
         try {
-            val (url, token, isDuplicate) = AnonymousFeedback.sendFeedback(ProxyHttpConnectionFactory(), params)
+            val (url, token, isDuplicate) = AnonymousFeedback.sendFeedback(ProxyHttpConnectionFactory, params)
             callback(url, token, isDuplicate)
         } catch (e: Exception) {
             errorCallback(e)
         }
     }
-
-    private inner class ProxyHttpConnectionFactory : AnonymousFeedback.HttpConnectionFactory() {
-        override fun openHttpConnection(url: String) = HttpConfigurable.getInstance().openHttpConnection(url)
-    }
 }

src/main/kotlin/com/demonwav/mcdev/platform/sponge/SpongeVersion.kt

@@ -10,10 +10,10 @@
 
 package com.demonwav.mcdev.platform.sponge
 
+import com.demonwav.mcdev.util.ProxyHttpConnectionFactory
 import com.demonwav.mcdev.util.fromJson
 import com.demonwav.mcdev.util.gson
 import org.jetbrains.concurrency.runAsync
-import java.net.URL
 import java.util.Objects
 import javax.swing.JComboBox
 
@@ -51,13 +51,14 @@ data class SpongeVersion(var versions: LinkedHashMap<String, String>, var select
 
     companion object {
         fun downloadData(): SpongeVersion {
-            val url = URL(spongeUrl)
-            val connection = url.openConnection()
+            val connection = ProxyHttpConnectionFactory.openHttpConnection(spongeUrl)
+
             connection.setRequestProperty(
                 "User-Agent",
                 "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9.2.2) Gecko/20100316 Firefox/3.6.2"
             )
-            val text = connection.getInputStream().use { it.reader().use { it.readText() } }
+
+            val text = connection.inputStream.use { stream -> stream.reader().use { it.readText() } }
             return gson.fromJson(text)
         }
     }

src/main/kotlin/com/demonwav/mcdev/util/HttpConnectionFactory.kt

@@ -0,0 +1,23 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2018 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.util
+
+import com.intellij.util.net.HttpConfigurable
+import java.net.HttpURLConnection
+import java.net.URL
+
+sealed class HttpConnectionFactory {
+    open fun openHttpConnection(url: String) = URL(url).openConnection() as HttpURLConnection
+}
+
+object ProxyHttpConnectionFactory : HttpConnectionFactory() {
+    override fun openHttpConnection(url: String) = HttpConfigurable.getInstance().openHttpConnection(url)
+}