summaryrefslogtreecommitdiff
path: root/src/se/leap/openvpn/LaunchVPN.java
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-10-21 01:03:45 -0700
committerSean Leonard <meanderingcode@aetherislands.net>2013-10-21 01:03:45 -0700
commit5e43d1ea5436af16f227a98fee495f707c885a96 (patch)
tree072b13f104cf2da87db80b0a6b78214139ae0618 /src/se/leap/openvpn/LaunchVPN.java
parentf49967fb3f24bf0a22d09b5823bd174a45e758f7 (diff)
parentf21030aacec6b7f36ea1b8adc86769e3f0b8a9ad (diff)
Merge branch 'release-0.2.1'0.2.1
Diffstat (limited to 'src/se/leap/openvpn/LaunchVPN.java')
-rw-r--r--src/se/leap/openvpn/LaunchVPN.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/se/leap/openvpn/LaunchVPN.java b/src/se/leap/openvpn/LaunchVPN.java
index 1df6be96..89f2d372 100644
--- a/src/se/leap/openvpn/LaunchVPN.java
+++ b/src/se/leap/openvpn/LaunchVPN.java
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Vector;
-import se.leap.leapclient.ConfigHelper;
-import se.leap.leapclient.EIP;
-import se.leap.leapclient.R;
+import se.leap.bitmaskclient.ConfigHelper;
+import se.leap.bitmaskclient.EIP;
+import se.leap.bitmaskclient.R;
import android.app.Activity;
import android.app.AlertDialog;
@@ -106,7 +106,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
final String action = intent.getAction();
// If something wants feedback, they sent us a Receiver
- mReceiver = intent.getParcelableExtra(ConfigHelper.RECEIVER_TAG);
+ mReceiver = intent.getParcelableExtra(EIP.RECEIVER_TAG);
// If the intent is a request to create a shortcut, we'll do that and exit
@@ -285,7 +285,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
// User does not want us to start, so we just vanish (well, now we tell our receiver, then vanish)
Bundle resultData = new Bundle();
// For now, nothing else is calling, so this "request" string is good enough
- resultData.putString(ConfigHelper.REQUEST_TAG, EIP.ACTION_START_EIP);
+ resultData.putString(EIP.REQUEST_TAG, EIP.ACTION_START_EIP);
mReceiver.send(RESULT_CANCELED, resultData);
finish();
}
@@ -373,7 +373,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
// Tell whom-it-may-concern that we started VPN
Bundle resultData = new Bundle();
// For now, nothing else is calling, so this "request" string is good enough
- resultData.putString(ConfigHelper.REQUEST_TAG, EIP.ACTION_START_EIP);
+ resultData.putString(EIP.REQUEST_TAG, EIP.ACTION_START_EIP);
mReceiver.send(RESULT_OK, resultData);
finish();