summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt/openvpn/activities
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-09-18 19:48:20 +0200
committerParménides GV <parmegv@sdf.org>2014-09-18 19:48:52 +0200
commit7780f13af9ad5a58d3f87ff4cc76ded6e79e59f5 (patch)
treeb336db06a4f8e8beccaa91b6c0e17026ca831cdc /app/src/main/java/de/blinkt/openvpn/activities
parent7e7c1454f9a6d45b0f1ccf4e0242f814089d25a8 (diff)
Updated ics-openvpn, restart after 1' being killed
Fixed notifications too (forgot to do it in another branch, it's #5964).
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/activities')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
index 8e418053..5910173a 100644
--- a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
@@ -6,14 +6,14 @@ import android.content.*;
import android.os.IBinder;
import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService;
import de.blinkt.openvpn.core.ProfileManager;
/**
* Created by arne on 13.10.13.
*/
public class DisconnectVPN extends Activity implements DialogInterface.OnClickListener{
- protected OpenVpnService mService;
+ protected OpenVPNService mService;
private ServiceConnection mConnection = new ServiceConnection() {
@@ -22,7 +22,7 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
public void onServiceConnected(ComponentName className,
IBinder service) {
// We've bound to LocalService, cast the IBinder and get LocalService instance
- OpenVpnService.LocalBinder binder = (OpenVpnService.LocalBinder) service;
+ OpenVPNService.LocalBinder binder = (OpenVPNService.LocalBinder) service;
mService = binder.getService();
}
@@ -36,8 +36,8 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
@Override
protected void onResume() {
super.onResume();
- Intent intent = new Intent(this, OpenVpnService.class);
- intent.setAction(OpenVpnService.START_SERVICE);
+ Intent intent = new Intent(this, OpenVPNService.class);
+ intent.setAction(OpenVPNService.START_SERVICE);
bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
showDisconnectDialog();
}