summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-09-26 13:04:26 +0200
committerParménides GV <parmegv@sdf.org>2014-09-26 13:04:26 +0200
commitbbf877a099112acbf34589b01503c3f5ee135dc0 (patch)
tree101d4fb8e347bd040ad963248611fd1684a12cd9 /ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
parent0a3900e145866c2f5b0adbd8c9c3fac2fb56efcb (diff)
parent22b7ee4614a2f47d55496de8a9b55040c0f4ba85 (diff)
Merge branch 'develop'0.7.0
Diffstat (limited to 'ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java')
-rw-r--r--ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
index 6d3dce69..e595106c 100644
--- a/ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -14,9 +14,7 @@ import net.openvpn.ovpn3.ClientAPI_TransportStats;
import java.lang.Override;
import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.OpenVPNManagement;
-import de.blinkt.openvpn.core.OpenVpnService;
-import de.blinkt.openvpn.core.VpnStatus;
+
import android.content.Context;
public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable, OpenVPNManagement {
@@ -29,7 +27,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
}
private VpnProfile mVp;
- private OpenVpnService mService;
+ private OpenVPNService mService;
class StatusPoller implements Runnable
{
@@ -224,7 +222,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
}
- public OpenVPNThreadv3(OpenVpnService openVpnService, VpnProfile vp) {
+ public OpenVPNThreadv3(OpenVPNService openVpnService, VpnProfile vp) {
init_process();
mVp =vp;
mService =openVpnService;