diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-09 12:46:06 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-09 12:48:20 +0100 |
commit | 9e6fe0e215e32343b38cdf20080de209a31287dd (patch) | |
tree | d4a8bf8aa9fc7caf06486bd2342ef28007329618 /app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java | |
parent | 73854e7fcdab77eaa408741b7353dea35b4803e1 (diff) |
8827 - merge request discussions
* add NullPointer checks to EipFragment
* add Provider to DownloadFailedDialog
* remove unused code
* store certificates for pinning in SharedPreferences
Diffstat (limited to 'app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java')
-rw-r--r-- | app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java index 554085b1..531c438a 100644 --- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java +++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java @@ -17,6 +17,7 @@ package se.leap.bitmaskclient; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentTransaction; @@ -99,7 +100,7 @@ public class ProviderListActivity extends ProviderListBaseActivity { * Retrys setup of last used provider, allows bypassing ca certificate validation. */ @Override - public void retrySetUpProvider(Provider provider) { + public void retrySetUpProvider(@NonNull Provider provider) { cancelSettingUpProvider(); if (!provider.hasCaCert()) { addAndSelectNewProvider(provider.getMainUrlString(), ProviderAPI.lastDangerOn()); |