aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java5
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java6
2 files changed, 4 insertions, 7 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
index 960b6d93..a93fabf6 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
@@ -171,11 +171,10 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
}
public void onRequestSetExcludedApplications(@SuppressWarnings("unused") final View view) {
- final FragmentManager fragmentManager = getFragmentManager();
- if (fragmentManager != null && binding != null) {
+ if (binding != null) {
final ArrayList<String> excludedApps = new ArrayList<>(binding.getConfig().getInterface().getExcludedApplications());
final AppListDialogFragment fragment = AppListDialogFragment.newInstance(excludedApps, this);
- fragment.show(fragmentManager, null);
+ fragment.show(getParentFragmentManager(), null);
}
}
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
index d903fa10..fe8a3da1 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
@@ -79,9 +79,7 @@ public class TunnelListFragment extends BaseFragment {
Config.parse(new ByteArrayInputStream(configText.getBytes(StandardCharsets.UTF_8)));
// Config text is valid, now create the tunnel…
- final FragmentManager fragmentManager = getFragmentManager();
- if (fragmentManager != null)
- ConfigNamingDialogFragment.newInstance(configText).show(fragmentManager, null);
+ ConfigNamingDialogFragment.newInstance(configText).show(getParentFragmentManager(), null);
} catch (final BadConfigException | IOException e) {
onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(e));
}
@@ -220,7 +218,7 @@ public class TunnelListFragment extends BaseFragment {
binding.createFab.setOnClickListener(v -> {
final AddTunnelsSheet bottomSheet = new AddTunnelsSheet();
bottomSheet.setTargetFragment(this, REQUEST_TARGET_FRAGMENT);
- bottomSheet.show(requireFragmentManager(), "BOTTOM_SHEET");
+ bottomSheet.show(getParentFragmentManager(), "BOTTOM_SHEET");
});
binding.executePendingBindings();
EdgeToEdge.setUpRoot((ViewGroup) binding.getRoot());