summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-01-18 12:33:43 +0100
committercyBerta <cyberta@riseup.net>2021-01-18 12:33:43 +0100
commitf296fc83eaf2c8f2c07cfc20fe87c8805a324ff2 (patch)
tree3a9822fbe15159fed89abfeaa83f08ea1aa1a0ca /app/src/main/java
parent71fcf8577611d3163ea81307b04db6ba57950bb7 (diff)
remove deprecated code
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/VpnProfile.java29
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java12
2 files changed, 0 insertions, 41 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 922eee58..f2da0838 100644
--- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -304,21 +304,6 @@ public class VpnProfile implements Serializable, Cloneable {
@Deprecated
public void upgradeProfile() {
- if (mProfileVersion < 2) {
- /* default to the behaviour the OS used */
- mAllowLocalLAN = Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT;
- }
-
- if (mProfileVersion < 4) {
- moveOptionsToConnection();
- mAllowedAppsVpnAreDisallowed = true;
- }
- if (mAllowedAppsVpn == null)
- mAllowedAppsVpn = new HashSet<>();
-
- if (mConnections == null)
- mConnections = new Connection[0];
-
if (mProfileVersion < 6) {
if (TextUtils.isEmpty(mProfileCreator))
mUserEditable = true;
@@ -333,20 +318,6 @@ public class VpnProfile implements Serializable, Cloneable {
}
- @Deprecated
- private void moveOptionsToConnection() {
- mConnections = new Connection[1];
- Connection conn = mUsePluggableTransports ? new Obfs4Connection() : new OpenvpnConnection();
-
- conn.setServerName(mServerName);
- conn.setServerPort(mServerPort);
- conn.setUseUdp(mUseUdp);
- conn.setCustomConfiguration("");
-
- mConnections[0] = conn;
-
- }
-
public String getConfigFile(Context context, boolean configForOvpn3) {
File cacheDir = context.getCacheDir();
diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
index a2f86e05..c780f487 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
@@ -27,18 +27,6 @@ public class Obfs4Connection extends Connection {
this.options = options;
}
- @Deprecated
- public Obfs4Connection() {
- setUseUdp(false);
- setServerName(DISPATCHER_IP);
- setServerPort(DISPATCHER_PORT);
- setProxyName("");
- setProxyPort("");
- setProxyAuthUser(null);
- setProxyAuthPassword(null);
- setProxyType(ProxyType.NONE);
- setUseProxyAuth(false); }
-
@Override
public Connection clone() throws CloneNotSupportedException {
Obfs4Connection connection = (Obfs4Connection) super.clone();