diff options
author | cyberta <cyberta@riseup.net> | 2023-11-01 03:52:50 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2023-11-01 03:52:50 +0000 |
commit | 85eb52e62b55d4fbe9434b250f3a6cecc70d77ec (patch) | |
tree | e320ddae310ea2fea65f563205e9d75e3839858d /app/src/main/java/se/leap/bitmaskclient/base/fragments | |
parent | d173064257b150b3ac344c2e0fd1f892e85edbbc (diff) | |
parent | cdd18e62f6a6fa0821445068049cb0b1de9e00f9 (diff) |
Merge branch 'last_tweaks_before_release' into 'master'
Last tweaks before release
See merge request leap/bitmask_android!262
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/fragments')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java index c500b55b..f4e09e62 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java @@ -171,11 +171,16 @@ public class EipFragment extends Fragment implements Observer { } restoreFromSavedInstance(savedInstanceState); - locationButton.setOnClickListener(v -> { + if (provider != null && provider.hasGatewaysInDifferentLocations()) { + locationButton.setOnClickListener(v -> { FragmentManagerEnhanced fragmentManager = new FragmentManagerEnhanced(getActivity().getSupportFragmentManager()); Fragment fragment = new GatewaySelectionFragment(); fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG); - }); + }); + locationButton.setEnabled(true); + } else { + locationButton.setEnabled(false); + } mainButton.setOnClickListener(v -> { handleIcon(); |