summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-02-06 17:02:00 +0100
committerFup Duck <fupduck@sacknagel.com>2018-02-06 17:02:00 +0100
commit268a7f205fa09edc145aace8bed30f75270a801f (patch)
treec50db0b7ccdbc879d985d692b99f68f0c273671e /app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
parentc0848bac7ac44f4b09f9e5d66ab71f079cb0f514 (diff)
8827 - handle switch provider correctly
* ProviderAPI no longer stores values in SharedPreferences * use EipCommand to start / stop EIP * update NavigationDrawer after changing provider * use Broadcasts for ProviderAPI * parse more properties from definition into Provider * ProviderApi no longer uses static variables * no more static Context in ProviderApiCommand
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
index 79a78fe1..7fcb5816 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
@@ -56,19 +56,22 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
@Override
public void setContentView(View view) {
super.setContentView(view);
- setProviderHeaderText(ConfigHelper.getProviderName(preferences));
+ if (provider != null)
+ setProviderHeaderText(provider.getName());
}
@Override
public void setContentView(int layoutResID) {
super.setContentView(layoutResID);
- setProviderHeaderText(ConfigHelper.getProviderName(preferences));
+ if (provider != null)
+ setProviderHeaderText(provider.getName());
}
@Override
public void setContentView(View view, ViewGroup.LayoutParams params) {
super.setContentView(view, params);
- setProviderHeaderText(ConfigHelper.getProviderName(preferences));
+ if (provider != null)
+ setProviderHeaderText(provider.getName());
}
protected void setProviderHeaderLogo(@DrawableRes int providerHeaderLogo) {