From e865889715b8511dd432b89958e27975592d98ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 2 Sep 2013 19:52:17 +0200 Subject: New provider hides other providers. If a new provider is added, it gets selected automatically hiding all other providers, as if it had been selected clicking on it. --- src/se/leap/bitmaskclient/ProviderDetailFragment.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/se/leap/bitmaskclient/ProviderDetailFragment.java') 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; -- cgit v1.2.3