Merge branch 'feature/clearer-wording' of https://github.com/parmegv/bitmask_android into feature/clearer_wording

1 files changed, 14 insertions, 1 deletions

diff --git a/src/se/leap/bitmaskclient/EIP.java b/src/se/leap/bitmaskclient/EIP.java
index f9384ff6..22f7558d 100644
--- a/src/se/leap/bitmaskclient/EIP.java
+++ b/src/se/leap/bitmaskclient/EIP.java
@@ -431,6 +431,7 @@ public final class EIP extends IntentService {
 			String ports = "ports";
 			String protos = "protocols";
 			String capabilities = "capabilities";
+			String location = "location";
 			
 			Vector<String> arg = new Vector<String>();
 			Vector<Vector<String>> args = new Vector<Vector<String>>();
@@ -457,7 +458,7 @@ public final class EIP extends IntentService {
 			}
 			
 			try {
-				arg.add("remote");
+				arg.add(remote);
 				arg.add(mGateway.getString(remote));
 			} catch (JSONException e) {
 				// TODO Auto-generated catch block
@@ -467,7 +468,19 @@ public final class EIP extends IntentService {
 			options.put("remote", (Vector<Vector<String>>) args.clone() );
 			arg.clear();
 			args.clear();
+
 			
+			try {
+				arg.add(location);
+				arg.add(mGateway.getString(location));
+			} catch (JSONException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			args.add((Vector<String>) arg.clone());
+			options.put("location", (Vector<Vector<String>>) args.clone() );
+			arg.clear();
+			args.clear();
 			JSONArray protocolsJSON = null;
 			arg.add("proto");
 			try {