Merge branch 'origin_0.9.8' into #8831_progress_animation_when_connecting

* added new EipCommand in StartActivity
* added option to add intent extras to EipCommand
* resolved merge conflicts and minor refactorings in:
	app/src/main/java/se/leap/bitmaskclient/EipFragment.java
	app/src/main/java/se/leap/bitmaskclient/eip/EIP.java

1 files changed, 3 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index 0b330ed9..1bdb53ab 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -94,14 +94,14 @@ public class GatewaysManager {
         return new Gson().toJson(gateways, list_type);
     }
 
-    public void fromEipServiceJson(JSONObject eip_definition) {
+    public void fromEipServiceJson(JSONObject eipDefinition) {
         try {
-            JSONArray gatewaysDefined = eip_definition.getJSONArray("gateways");
+            JSONArray gatewaysDefined = eipDefinition.getJSONArray("gateways");
             for (int i = 0; i < gatewaysDefined.length(); i++) {
                 JSONObject gw = gatewaysDefined.getJSONObject(i);
                 if (isOpenVpnGateway(gw)) {
                     JSONObject secrets = secretsConfiguration();
-                    Gateway aux = new Gateway(eip_definition, secrets, gw);
+                    Gateway aux = new Gateway(eipDefinition, secrets, gw);
                     if (!containsProfileWithSecrets(aux.getProfile())) {
                         addGateway(aux);
                     }