improve layout

* improve layout
* gracefully handle orientation changes
* respect small devices
* set correct colors for buttons, error messages...

1 files changed, 7 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index 60b1b93c..95daccc6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -158,9 +158,13 @@ public final class Provider implements Parcelable {
                 name = definition.getJSONObject(API_TERM_NAME).getString(lang);
             else throw new JSONException("Provider not defined");
         } catch (JSONException e) {
-            if (mainUrl != null) {
-                String host = mainUrl.getDomain();
-                name = host.substring(0, host.indexOf("."));
+            try {
+                name = definition.getJSONObject(API_TERM_NAME).getString("en");
+            } catch (JSONException e2) {
+                if (mainUrl != null) {
+                    String host = mainUrl.getDomain();
+                    name = host.substring(0, host.indexOf("."));
+                }
             }
         }