From b065fa48e802487198ad73915dd017c4464e8c62 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Fri, 19 Jan 2018 17:34:45 +0100
Subject: improve layout

* improve layout
* gracefully handle orientation changes
* respect small devices
* set correct colors for buttons, error messages...
---
 .../bitmaskclient/ConfigWizardBaseActivity.java    | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
index 3e83d9bc..98715c1a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.AppCompatImageView;
 import android.support.v7.widget.AppCompatTextView;
 import android.view.View;
@@ -14,10 +15,14 @@ import android.widget.LinearLayout;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Locale;
+
 import butterknife.InjectView;
+import se.leap.bitmaskclient.userstatus.SessionDialog;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
+import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 
 /**
@@ -45,10 +50,14 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
     @InjectView(R.id.content)
     protected LinearLayout content;
 
+    protected Provider provider;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
+
+        provider = getIntent().getParcelableExtra(PROVIDER_KEY);
     }
 
     @Override
@@ -84,12 +93,26 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
     protected String getProviderName() {
         try {
             JSONObject providerJson = new JSONObject(preferences.getString(Provider.KEY, ""));
-            return providerJson.getJSONObject(Provider.NAME).getString("en");
+            String lang = Locale.getDefault().getLanguage();
+            return providerJson.getJSONObject(Provider.NAME).getString(lang);
         } catch (JSONException e) {
-            return null;
+            try {
+                JSONObject providerJson = new JSONObject(preferences.getString(Provider.KEY, ""));
+                return providerJson.getJSONObject(Provider.NAME).getString("en");
+            } catch (JSONException e2) {
+                return null;
+            }
         }
     }
 
+    protected String getProviderDomain() {
+        try {
+            JSONObject providerJson = new JSONObject(preferences.getString(Provider.KEY, ""));
+            return providerJson.getString(Provider.DOMAIN);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
     protected void hideProgressBar() {
         loadingScreen.setVisibility(GONE);
         content.setVisibility(VISIBLE);
-- 
cgit v1.2.3