Unified Diff: src/org/adblockplus/android/configurators/ProxyRegistrationType.java
Issue 4705284891082752:
Proxy configurators (Closed)
Patch Set: FIXME removed
Created Aug. 19, 2014, 12:58 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/org/adblockplus/android/configurators/ProxyConfigurators.java ('k')
|
src/org/adblockplus/brazil/RequestHandler.java » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/org/adblockplus/android/configurators/ProxyRegistrationType.java |
| diff --git a/src/org/adblockplus/libadblockplus/AdblockPlusException.java b/src/org/adblockplus/android/configurators/ProxyRegistrationType.java |
| similarity index 50% |
| copy from src/org/adblockplus/libadblockplus/AdblockPlusException.java |
| copy to src/org/adblockplus/android/configurators/ProxyRegistrationType.java |
| index be88230e374c218cd7f75905fb53398f89524bea..a2f0e6316184c98b95b79e9589eb2949db3b6727 100644 |
| --- a/src/org/adblockplus/libadblockplus/AdblockPlusException.java |
| +++ b/src/org/adblockplus/android/configurators/ProxyRegistrationType.java |
| @@ -15,24 +15,34 @@ |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| -package org.adblockplus.libadblockplus; |
| +package org.adblockplus.android.configurators; |
| -public class AdblockPlusException extends RuntimeException |
| +import org.adblockplus.android.ProxyServerType; |
| + |
| +public enum ProxyRegistrationType |
| { |
| - private static final long serialVersionUID = -8127654134450836743L; |
| + UNKNOWN(ProxyServerType.UNKNOWN, false), |
| + CYANOGENMOD(ProxyServerType.HTTPS, true), |
| + IPTABLES(ProxyServerType.HTTP, true), |
| + NATIVE(ProxyServerType.HTTPS, true), |
| + MANUAL(ProxyServerType.HTTPS, false); |
| + |
| + private final ProxyServerType proxyType; |
| + private final boolean autoConfigured; |
| - public AdblockPlusException(final String message) |
| + private ProxyRegistrationType(final ProxyServerType proxyType, final boolean autoConfigured) |
| { |
| - super(message); |
| + this.proxyType = proxyType; |
| + this.autoConfigured = autoConfigured; |
| } |
| - public AdblockPlusException(final String message, final Throwable throwable) |
| + public ProxyServerType getProxyType() |
| { |
| - super(message, throwable); |
| + return this.proxyType; |
| } |
| - public AdblockPlusException(final Throwable throwable) |
| + public boolean isAutoConfigured() |
| { |
| - super(throwable); |
| + return this.autoConfigured; |
| } |
| } |
« no previous file with comments
|
« src/org/adblockplus/android/configurators/ProxyConfigurators.java ('k')
|
src/org/adblockplus/brazil/RequestHandler.java » ('j')
|
no next file with comments »
