From ba56044ad432727f00704408dc109543bdcf3c9f Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Mon, 2 Feb 2015 21:46:43 +0100 Subject: [PATCH] check update over proxy --- .../flash/configuration/Configuration.java | 3 +++ src/com/jpexs/decompiler/flash/gui/Main.java | 23 ++++++++++++------- .../locales/AdvancedSettingsDialog.properties | 3 +++ .../AdvancedSettingsDialog_hu.properties | 3 +++ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java index ea7b3922b..c5318cd2d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -314,6 +314,9 @@ public class Configuration { @ConfigurationName("check.updates.enabled") public static final ConfigurationItem checkForUpdatesAuto = null; + @ConfigurationCategory("update") + public static final ConfigurationItem updateProxyAddress = null; + @ConfigurationDefaultString("") @ConfigurationName("export.formats") public static final ConfigurationItem lastSelectedExportFormats = null; diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java index 3c6665999..e5706b837 100644 --- a/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/src/com/jpexs/decompiler/flash/gui/Main.java @@ -1351,15 +1351,22 @@ public class Main { return false; } - String acceptVersions = ""; - for (String a : accepted) { - if (!acceptVersions.isEmpty()) { - acceptVersions += ","; - } - acceptVersions += a; - } + String acceptVersions = String.join(",", accepted); try { - Socket sock = new Socket("www.free-decompiler.com", 80); + String proxyAddress = Configuration.updateProxyAddress.get(); + Socket sock; + if (proxyAddress != null) { + int port = 8080; + if (proxyAddress.contains(":")) { + String[] parts = proxyAddress.split(":"); + port = Integer.parseInt(parts[1]); + proxyAddress = parts[0]; + } + + sock = new Socket(proxyAddress, port); + } else { + sock = new Socket("www.free-decompiler.com", 80); + } OutputStream os = sock.getOutputStream(); String currentLoc = Configuration.locale.get("en"); os.write(("GET /flash/update.html?action=check¤tVersion=" + URLEncoder.encode(currentVersion, "UTF-8") diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index 315c3313c..91c6bfebc 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -314,3 +314,6 @@ config.description.showCodeSavedMessage = Show again code saved message config.name.showTraitSavedMessage = Show again trait saved message config.description.showTraitSavedMessage = Show again trait saved message + +config.name.updateProxyAddress = Http Proxy address for checking updates +config.description.updateProxyAddress = Http Proxy address for checking updates. Format: example.com:8080 diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties index b846ed534..d3aab00d1 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties @@ -314,3 +314,6 @@ config.description.showCodeSavedMessage = K\u00f3d mentve \u00fczenet \u00fajra config.name.showTraitSavedMessage = Trait mentve \u00fczenet \u00fajra mutat\u00e1sa config.description.showTraitSavedMessage = Trait mentve \u00fczenet \u00fajra mutat\u00e1sa + +config.name.updateProxyAddress = Http Proxy c\u00edm a friss\u00edt\u00e9sek keres\u00e9s\u00e9hez +config.description.updateProxyAddress = Http Proxy c\u00edm a friss\u00edt\u00e9sek keres\u00e9s\u00e9hez. Form\u00e1tum: example.com:8080