diff options
Diffstat (limited to 'src/se/leap/bitmaskclient/ProviderDetailFragment.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderDetailFragment.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/se/leap/bitmaskclient/ProviderDetailFragment.java b/src/se/leap/bitmaskclient/ProviderDetailFragment.java index 2616cdbf..8ec7d154 100644 --- a/src/se/leap/bitmaskclient/ProviderDetailFragment.java +++ b/src/se/leap/bitmaskclient/ProviderDetailFragment.java @@ -82,19 +82,12 @@ public class ProviderDetailFragment extends DialogFragment { @Override
public void onCancel(DialogInterface dialog) {
- super.onCancel(dialog);
-<<<<<<< HEAD + super.onCancel(dialog); ConfigHelper.removeFromSharedPref(Provider.KEY);
ConfigHelper.removeFromSharedPref(ProviderItem.DANGER_ON);
ConfigHelper.removeFromSharedPref(EIP.ALLOWED_ANON);
- ConfigHelper.removeFromSharedPref(EIP.KEY);
-======= - ConfigHelper.removeFromSharedPref(ConfigHelper.PROVIDER_KEY);
- ConfigHelper.removeFromSharedPref(ConfigHelper.DANGER_ON);
- ConfigHelper.removeFromSharedPref(ConfigHelper.ALLOWED_ANON);
- ConfigHelper.removeFromSharedPref(ConfigHelper.EIP_SERVICE_KEY);
- interface_with_configuration_wizard.refreshProviderList(0);
->>>>>>> Only selected provider remain visible. + ConfigHelper.removeFromSharedPref(EIP.KEY); + interface_with_configuration_wizard.unhideAll(); }
public static DialogFragment newInstance() {
@@ -116,7 +109,7 @@ public class ProviderDetailFragment extends DialogFragment { public interface ProviderDetailFragmentInterface {
public void login();
public void use_anonymously();
- public void refreshProviderList(int top_padding);
+ public void unhideAll();
}
ProviderDetailFragmentInterface interface_with_configuration_wizard;
|