static boolean alreadyDetectedProxy = false;
/** the result of proxy autodetection */
- static HTTP.ProxyInfo cachedProxyInfo = null;
+ static Proxy cachedProxyInfo = null;
/** the current build */
public static String build = "unknown";
}
/** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */
- protected synchronized HTTP.ProxyInfo _detectProxy() { return null; }
+ protected synchronized Proxy _detectProxy() { return null; }
/** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
protected String _fileDialog(String suggestedFileName, boolean write) { return null; }
}
/** detects proxy settings */
- public static synchronized HTTP.ProxyInfo detectProxy() {
+ public static synchronized Proxy detectProxy() {
if (cachedProxyInfo != null) return cachedProxyInfo;
if (alreadyDetectedProxy) return null;
alreadyDetectedProxy = true;
if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
- cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaManual();
+ cachedProxyInfo = Proxy.detectProxyViaManual();
if (cachedProxyInfo != null) return cachedProxyInfo;
if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
cachedProxyInfo = platform._detectProxy();
if (cachedProxyInfo != null) return cachedProxyInfo;
- if (Log.on) Log.log(Platform.class, "attempting WPAD proxy detection");
- cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaWPAD();
- if (cachedProxyInfo != null) return cachedProxyInfo;
-
return cachedProxyInfo;
}