diff options
author | Parménides GV <parmegv@sdf.org> | 2014-09-20 11:00:23 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-09-20 11:00:23 +0200 |
commit | cfe800509413a00fa51f491574b25773ee20dffd (patch) | |
tree | b336db06a4f8e8beccaa91b6c0e17026ca831cdc /ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt | |
parent | 7e7c1454f9a6d45b0f1ccf4e0242f814089d25a8 (diff) | |
parent | 7780f13af9ad5a58d3f87ff4cc76ded6e79e59f5 (diff) |
Merge branch 'feature/Restart-the-service-after-being-unexpectedly-killed-by-Android-#5934' into develop
Diffstat (limited to 'ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt')
-rw-r--r-- | ics-openvpn-stripped/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 8 |
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; |