summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-01 19:52:54 +0100
committerParménides GV <parmegv@sdf.org>2014-12-01 19:52:54 +0100
commita59f2e0083b05fd94e2d0d2c1fcfeaa42b851531 (patch)
treefa4728712320ba459760906390851a09930f7712 /app/src/main
parentb32fdf11b0ef473d489f9fb23f136fecf7051354 (diff)
Reordered EIP methods.
Written basic skeleton for testEIP, renamed testDashboard to start, in the future, unit tests.
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/eip/EIP.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index a67eaccd..b4208556 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -160,21 +160,12 @@ public final class EIP extends IntentService {
tellToReceiver(ACTION_STOP_EIP, result_code);
}
-
- private void tellToReceiver(String action, int resultCode) {
- if (mReceiver != null){
- Bundle resultData = new Bundle();
- resultData.putString(REQUEST_TAG, action);
- mReceiver.send(resultCode, resultData);
- }
- }
/**
* Checks the last stored status notified by ics-openvpn
* Sends <code>Activity.RESULT_CANCELED</code> to the ResultReceiver that made the
* request if it's not connected, <code>Activity.RESULT_OK</code> otherwise.
*/
-
private void isRunning() {
EipStatus eip_status = EipStatus.getInstance();
int resultCode = (eip_status.isConnected()) ?
@@ -253,4 +244,12 @@ public final class EIP extends IntentService {
Activity.RESULT_CANCELED;
tellToReceiver(ACTION_CHECK_CERT_VALIDITY, resultCode);
}
+
+ private void tellToReceiver(String action, int resultCode) {
+ if (mReceiver != null){
+ Bundle resultData = new Bundle();
+ resultData.putString(REQUEST_TAG, action);
+ mReceiver.send(resultCode, resultData);
+ }
+ }
}