summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorrezanejati <dev.njti@gmail.com>2019-08-05 16:39:05 +0430
committerrezanejati <dev.njti@gmail.com>2019-08-05 16:39:05 +0430
commitf3fec57a18f79d41624349ad47cd0b1fe9dfdbbf (patch)
tree70b8726b7b08313183ed9884fa16dcd56e38e8b6 /app
parent5173dd0118ab6683013c45297c0eb589d0a52a65 (diff)
downloadAntennaPod-f3fec57a18f79d41624349ad47cd0b1fe9dfdbbf.zip
Add socks proxy in network settings
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index 8f2629b43..71d016e41 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -92,7 +92,10 @@ public class ProxyDialog {
if(!TextUtils.isEmpty(port)) {
portValue = Integer.valueOf(port);
}
- proxy = ProxyConfig.http(host, portValue, username, password);
+ if (Proxy.Type.valueOf(type) == Proxy.Type.SOCKS)
+ proxy = ProxyConfig.socks(host, portValue, username, password);
+ else
+ proxy = ProxyConfig.http(host, portValue, username, password);
}
UserPreferences.setProxyConfig(proxy);
AntennapodHttpClient.reinit();
@@ -103,7 +106,7 @@ public class ProxyDialog {
.build();
View view = dialog.getCustomView();
spType = view.findViewById(R.id.spType);
- String[] types = { Proxy.Type.DIRECT.name(), Proxy.Type.HTTP.name() };
+ String[] types = {Proxy.Type.DIRECT.name(), Proxy.Type.HTTP.name(), Proxy.Type.SOCKS.name()};
ArrayAdapter<String> adapter = new ArrayAdapter<>(context,
android.R.layout.simple_spinner_item, types);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);