summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-06-18 23:27:28 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-06-20 18:54:44 -0600
commit13fd30cdc0740c60bfeed92c7012bef9a46d4485 (patch)
tree1d6378dfaf1ac7484647c7473b719adcce2af8d1
parentf993d85bcb7e6236960570fef88a22d8d6bcc5e7 (diff)
Rename EIP.OVPNGateway argument and member variable for readability
-rw-r--r--src/se/leap/leapclient/EIP.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/se/leap/leapclient/EIP.java b/src/se/leap/leapclient/EIP.java
index 5287173c..cadb4494 100644
--- a/src/se/leap/leapclient/EIP.java
+++ b/src/se/leap/leapclient/EIP.java
@@ -239,7 +239,7 @@ public final class EIP extends IntentService {
private String TAG = "OVPNGateway";
private VpnProfile mVpnProfile;
- private JSONObject gateway;
+ private JSONObject mGateway;
private HashMap<String,Vector<Vector<String>>> options = new HashMap<String, Vector<Vector<String>>>();
@@ -264,9 +264,9 @@ public final class EIP extends IntentService {
}
}
- protected OVPNGateway(JSONObject gw){
+ protected OVPNGateway(JSONObject gateway){
- gateway = gw;
+ mGateway = gateway;
// Currently deletes VpnProfile for host, if there already is one, and builds new
ProfileManager vpl = ProfileManager.getInstance(context);
@@ -295,7 +295,7 @@ public final class EIP extends IntentService {
String newname;
try {
- newname = gateway.getString("host");
+ newname = mGateway.getString("host");
while(vpl.getProfileByName(newname)!=null) {
i++;
if(i==1)
@@ -347,7 +347,7 @@ public final class EIP extends IntentService {
try {
arg.add("remote");
- arg.add(gateway.getString(remote));
+ arg.add(mGateway.getString(remote));
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -360,7 +360,7 @@ public final class EIP extends IntentService {
JSONArray protocolsJSON = null;
arg.add("proto");
try {
- protocolsJSON = gateway.getJSONObject(capabilities).getJSONArray(protos);
+ protocolsJSON = mGateway.getJSONObject(capabilities).getJSONArray(protos);
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -381,7 +381,7 @@ public final class EIP extends IntentService {
String port = null;
arg.add("port");
try {
- port = gateway.getJSONObject(capabilities).getJSONArray(ports).optString(0);
+ port = mGateway.getJSONObject(capabilities).getJSONArray(ports).optString(0);
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();