summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2023-08-04 03:51:10 +0200
committercyBerta <cyberta@riseup.net>2023-08-04 03:51:10 +0200
commit2ba1e6a1b48ab2408f8cfa1a184e10b7c1b018b8 (patch)
treec9d44c4a21a8d75e8bc05a220cf98788d9640724 /app
parente81a0f4007d658c644330f4e8e5806236dd1a70d (diff)
fix cancel button visibility
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java1
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java
index 8012fe76..0ddf8ffc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java
@@ -55,6 +55,7 @@ public class BaseSetupFragment extends Fragment {
super.onDetach();
setupActivityCallback.removeOnPageChangeCallback(viewPagerCallback);
setupActivityCallback = null;
+ callFragmentSelected = false;
}
public void onFragmentSelected() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java
index cabde405..ba3ff4aa 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java
@@ -116,7 +116,7 @@ public class ProviderSelectionFragment extends BaseSetupFragment implements Canc
@Override
public void onFragmentSelected() {
super.onFragmentSelected();
- setupActivityCallback.setCancelButtonHidden(!ProviderObservable.getInstance().getCurrentProvider().isConfigured());
+ setupActivityCallback.setCancelButtonHidden(true);
setupActivityCallback.setNavigationButtonHidden(false);
}