Merge branch '0.9.8/startActivity' into '0.9.8'

Add Splash StartActivity

See merge request leap/bitmask_android!19

2 files changed, 6 insertions, 6 deletions

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java
index 15bb53e1..c5a6e809 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestEIP.java
@@ -59,14 +59,14 @@ public class TestEIP extends ServiceTestCase<EIP> {
     }
 
     private void testEmptyCertificate() {
-        preferences.edit().putString(Constants.VPN_CERTIFICATE, "").apply();
-        startService(Constants.ACTION_CHECK_CERT_VALIDITY);
+        preferences.edit().putString(Constants.PROVIDER_VPN_CERTIFICATE, "").apply();
+        startService(Constants.EIP_ACTION_CHECK_CERT_VALIDITY);
     }
 
     private void testExpiredCertificate() {
         String expired_certificate = "expired certificate";
-        preferences.edit().putString(Constants.VPN_CERTIFICATE, expired_certificate).apply();
-        startService(Constants.ACTION_CHECK_CERT_VALIDITY);
+        preferences.edit().putString(Constants.PROVIDER_VPN_CERTIFICATE, expired_certificate).apply();
+        startService(Constants.EIP_ACTION_CHECK_CERT_VALIDITY);
     }
 
     private void startService(String action) {
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java
index 0a76638f..b8cc9715 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/TestGatewaysManager.java
@@ -25,7 +25,7 @@ import org.json.*;
 import java.io.IOException;
 import java.util.Arrays;
 
-import se.leap.bitmaskclient.*;
+import se.leap.bitmaskclient.Constants;
 import se.leap.bitmaskclient.eip.*;
 
 /**
@@ -109,7 +109,7 @@ public class TestGatewaysManager extends InstrumentationTestCase {
 
     private void mockGatewaysManager() {
         context = getInstrumentation().getContext();
-        preferences = context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE);
+        preferences = context.getSharedPreferences(Constants.SHARED_PREFERENCES, Activity.MODE_PRIVATE);
         gateways_manager = new GatewaysManager(context, preferences);
     }