Console: Hide Reseed HTTP proxy options if no HTTP URLs (ticket #2007)

apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java

@@ -78,7 +78,7 @@ public class ConfigReseedHelper extends HelperBase {
         return getChecked(Reseeder.PROP_SPROXY_AUTH_ENABLE);
     }
 
-    public String getReseedURL() {
+    private List<String> reseedList() {
         String urls = _context.getProperty(Reseeder.PROP_RESEED_URL, Reseeder.DEFAULT_SEED_URL + ',' + Reseeder.DEFAULT_SSL_SEED_URL);
         StringTokenizer tok = new StringTokenizer(urls, " ,\r\n");
         List<String> URLList = new ArrayList<String>(16);
@@ -87,6 +87,11 @@ public class ConfigReseedHelper extends HelperBase {
             if (s.length() > 0)
                 URLList.add(s);
         }
+        return URLList;
+    }
+
+    public String getReseedURL() {
+        List<String> URLList = reseedList();
         Collections.sort(URLList);
         StringBuilder buf = new StringBuilder();
         for (String s : URLList) {
@@ -96,4 +101,49 @@ public class ConfigReseedHelper extends HelperBase {
         }
         return buf.toString();
     }
+
+    /**
+     *  @return true only if we have both http and https URLs
+     *  @since 0.9.33
+     */
+    public boolean shouldShowSelect() {
+        boolean http = false;
+        boolean https = false;
+        for (String u : reseedList()) {
+            if (u.startsWith("https://")) {
+                if (http)
+                    return true;
+                https = true;
+            } else if (u.startsWith("http://")) {
+                if (https)
+                    return true;
+                http = true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *  @return true only if we have a http URL
+     *  @since 0.9.33
+     */
+    public boolean shouldShowHTTPProxy() {
+        for (String u : reseedList()) {
+            if (u.startsWith("http://"))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     *  @return true only if we have a https URL
+     *  @since 0.9.33
+     */
+    public boolean shouldShowHTTPSProxy() {
+        for (String u : reseedList()) {
+            if (u.startsWith("https://"))
+                return true;
+        }
+        return false;
+    }
 }

apps/routerconsole/jsp/configreseed.jsp

@@ -92,6 +92,8 @@
 <%=intl._t("Change these only if HTTPS is blocked by a restrictive firewall and reseed has failed.")%>
   </td>
  </tr>
+
+<% if (reseedHelper.shouldShowSelect()) { %>
 <tr><td align="right"><b><%=intl._t("Reseed URL Selection")%>:</b></td>
 <td><label><input type="radio" class="optbox" name="mode" value="0" <%=reseedHelper.modeChecked(0) %> >
 <%=intl._t("Try SSL first then non-SSL")%></label><br>
@@ -99,11 +101,14 @@
 <%=intl._t("Use SSL only")%></label><br>
 <label><input type="radio" class="optbox" name="mode" value="2" <%=reseedHelper.modeChecked(2) %> >
 <%=intl._t("Use non-SSL only")%></label></td></tr>
+<% } // shouldShowSelect %>
+
 <tr><td align="right"><b><%=intl._t("Reseed URLs")%>:</b></td>
 <td><textarea wrap="off" name="reseedURL" cols="60" rows="7" spellcheck="false"><jsp:getProperty name="reseedHelper" property="reseedURL" /></textarea>
 <div class="formaction" id="resetreseed"><input type="submit" name="action" class="reload" value="<%=intl._t("Reset URL list")%>" /></div>
 </td></tr>
 
+<% if (reseedHelper.shouldShowHTTPProxy()) { %>
 <tr><td align="right"><label for="enableproxy"><b><%=intl._t("Enable HTTP Proxy?")%></b></label></td>
 <td><input type="checkbox" class="optbox" name="enable" id="enableproxy" value="true" <jsp:getProperty name="reseedHelper" property="enable" /> ></td></tr>
 <tr><td align="right"><b><%=intl._t("HTTP Proxy Host")%>:</b></td>
@@ -117,8 +122,10 @@
 <td><input name="username" type="text" value="<jsp:getProperty name="reseedHelper" property="username" />" ></td></tr>
 <tr><td align="right"><b><%=intl._t("HTTP Proxy Password")%>:</b></td>
 <td><input name="nofilter_password" type="password" value="<jsp:getProperty name="reseedHelper" property="nofilter_password" />" ></td></tr>
+<% } // shouldShowHTTPProxy %>
 
 <!-- TODO Need SSLEepGet support
+<% if (reseedHelper.shouldShowHTTPSProxy()) { %>
 <tr><td align="right"><b><%=intl._t("Enable HTTPS Proxy?")%></b></td>
 <td><input type="checkbox" class="optbox" name="senable" value="true" <jsp:getProperty name="reseedHelper" property="senable" /> ></td></tr>
 <tr><td align="right"><b><%=intl._t("HTTPS Proxy Host")%>:</b></td>
@@ -132,6 +139,7 @@
 <td><input name="susername" type="text" value="<jsp:getProperty name="reseedHelper" property="susername" />" ></td></tr>
 <tr><td align="right"><b><%=intl._t("HTTPS Proxy Password")%>:</b></td>
 <td><input name="nofilter_spassword" type="password" value="<jsp:getProperty name="reseedHelper" property="nofilter_spassword" />" ></td></tr>
+<% } // shouldShowHTTPSProxy %>
 -->
 
  <tr>