summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-07-02 22:57:27 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-07-19 22:14:27 -0600
commit99b65032fae646293a6e7ddeaa8553d9e0590f3d (patch)
treedb26595e4626f95c8221f142877aaaf7655bab4e /src
parent3d652a20b5c28b0a424d516161034b23b2523d95 (diff)
Display provider domain on Dashboard instead of name
Diffstat (limited to 'src')
-rw-r--r--src/se/leap/leapclient/Dashboard.java2
-rw-r--r--src/se/leap/leapclient/Provider.java12
2 files changed, 13 insertions, 1 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index 4cd517a9..96f542bf 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -120,7 +120,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
provider.init( this );
providerNameTV = (TextView) findViewById(R.id.providerName);
- providerNameTV.setText(provider.getName());
+ providerNameTV.setText(provider.getDomain());
providerNameTV.setTextSize(28);
FragmentManager fragMan = getFragmentManager();
diff --git a/src/se/leap/leapclient/Provider.java b/src/se/leap/leapclient/Provider.java
index 189c3a84..72184eb0 100644
--- a/src/se/leap/leapclient/Provider.java
+++ b/src/se/leap/leapclient/Provider.java
@@ -36,6 +36,7 @@ public final class Provider implements Serializable {
// Some API pieces we want to know about
private static final String API_TERM_SERVICES = "services";
private static final String API_TERM_NAME = "name";
+ private static final String API_TERM_DOMAIN = "domain";
private static final String API_TERM_DEFAULT_LANGUAGE = "default_language";
protected static final String[] API_EIP_TYPES = {"openvpn"};
@@ -79,6 +80,17 @@ public final class Provider implements Serializable {
}
}
+ protected String getDomain(){
+ String domain = "Null";
+ try {
+ domain = definition.getString(API_TERM_DOMAIN);
+ } catch (JSONException e) {
+ domain = "Null";
+ e.printStackTrace();
+ }
+ return domain;
+ }
+
protected String getName(){
// Should we pass the locale in, or query the system here?
String lang = Locale.getDefault().getLanguage();