diff options
author | Parménides GV <parmegv@sdf.org> | 2015-03-24 19:37:41 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-03-24 19:37:41 +0100 |
commit | 6954d5a4d7739b472ba74bacac76d30aa9e065c9 (patch) | |
tree | 86fddd58a06fb4d57a2f8cd34b017ed86969bdc0 /app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java | |
parent | fb4f332e4a0c669fa559aee0dba159b82c9d28c7 (diff) | |
parent | 9e5d0f1a2399787b1a57349e0e3b5ad596fcbf8f (diff) |
Merge branch 'bug/Clean-logs-and-indentation-#6810' into develop
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java index 5f5dcabd..0b9c5832 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java @@ -16,16 +16,11 @@ */ package se.leap.bitmaskclient.eip; -import android.content.SharedPreferences; -import android.util.Log; +import org.json.*; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; +import java.util.*; -import java.util.Iterator; - -import se.leap.bitmaskclient.Provider; +import se.leap.bitmaskclient.*; public class VpnConfigGenerator { @@ -57,7 +52,7 @@ public class VpnConfigGenerator { String common_options = ""; try { Iterator keys = general_configuration.keys(); - while ( keys.hasNext() ){ + while (keys.hasNext()) { String key = keys.next().toString(); common_options += key + " "; @@ -90,11 +85,11 @@ public class VpnConfigGenerator { String ip_address = gateway.getString(ip_address_keyword); JSONObject capabilities = gateway.getJSONObject(capabilities_keyword); JSONArray ports = capabilities.getJSONArray(ports_keyword); - for (int i=0; i<ports.length(); i++) { + for (int i = 0; i < ports.length(); i++) { String port_specific_remotes = ""; int port = ports.getInt(i); JSONArray protocols = capabilities.getJSONArray(protocol_keyword); - for ( int j=0; j<protocols.length(); j++ ) { + for (int j = 0; j < protocols.length(); j++) { String protocol = protocols.optString(j); String new_remote = remote_keyword + " " + ip_address + " " + port + " " + protocol + new_line; @@ -136,7 +131,7 @@ public class VpnConfigGenerator { + "</cert>"; return ca + new_line + key + new_line + openvpn_cert; - } catch(JSONException e) { + } catch (JSONException e) { e.printStackTrace(); return ""; } |