diff options
author | ByteHamster <info@bytehamster.com> | 2022-02-19 13:46:12 +0100 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2022-02-19 13:46:12 +0100 |
commit | acb384b128c00580878b55aeb8dfdede7e3dc0cc (patch) | |
tree | 9e1b9b774fcc0ac90bb24cc4ca6eda95d1943f02 /core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | |
parent | 6273dff85f4b9bba233ddf5d30ea36b617b09334 (diff) | |
parent | f4c90885d7e60089bfd94f10b09895a477f33187 (diff) | |
download | antennapod-acb384b128c00580878b55aeb8dfdede7e3dc0cc.zip |
Merge branch 'master' into develop
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 08daf01e2..74f89a039 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -611,27 +611,22 @@ public class UserPreferences { public static void setProxyConfig(ProxyConfig config) { SharedPreferences.Editor editor = prefs.edit(); editor.putString(PREF_PROXY_TYPE, config.type.name()); - Proxy.Type type = Proxy.Type.valueOf(config.type.name()); - if (type == Proxy.Type.DIRECT) { - editor.apply(); - return; - } - if(TextUtils.isEmpty(config.host)) { + if (TextUtils.isEmpty(config.host)) { editor.remove(PREF_PROXY_HOST); } else { editor.putString(PREF_PROXY_HOST, config.host); } - if(config.port <= 0 || config.port > 65535) { + if (config.port <= 0 || config.port > 65535) { editor.remove(PREF_PROXY_PORT); } else { editor.putInt(PREF_PROXY_PORT, config.port); } - if(TextUtils.isEmpty(config.username)) { + if (TextUtils.isEmpty(config.username)) { editor.remove(PREF_PROXY_USER); } else { editor.putString(PREF_PROXY_USER, config.username); } - if(TextUtils.isEmpty(config.password)) { + if (TextUtils.isEmpty(config.password)) { editor.remove(PREF_PROXY_PASSWORD); } else { editor.putString(PREF_PROXY_PASSWORD, config.password); |