From 2ba1e6a1b48ab2408f8cfa1a184e10b7c1b018b8 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 4 Aug 2023 03:51:10 +0200
Subject: fix cancel button visibility

---
 .../leap/bitmaskclient/providersetup/fragments/BaseSetupFragment.java   | 1 +
 .../providersetup/fragments/ProviderSelectionFragment.java              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient')

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);
     }
 
-- 
cgit v1.2.3