From a7713372d3f351993ae5357e109c5087d450ca9f Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 6 Oct 2020 14:28:05 +0200 Subject: [PATCH] android: Replace deprecated getFragmentManager() in TNC-related Fragments --- .../main/java/org/strongswan/android/ui/ImcStateFragment.java | 4 ++-- .../android/ui/RemediationInstructionsFragment.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/ImcStateFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/ImcStateFragment.java index fe8e770db..9178a1be9 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/ImcStateFragment.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/ImcStateFragment.java @@ -88,7 +88,7 @@ public class ImcStateFragment extends Fragment implements VpnStateListener context.bindService(new Intent(context, VpnStateService.class), mServiceConnection, Service.BIND_AUTO_CREATE); /* hide it initially */ - getFragmentManager().beginTransaction().hide(this).commit(); + getParentFragmentManager().beginTransaction().hide(this).commit(); } @Override @@ -192,7 +192,7 @@ public class ImcStateFragment extends Fragment implements VpnStateListener public void updateView() { - FragmentManager fm = getFragmentManager(); + FragmentManager fm = getParentFragmentManager(); if (fm == null) { return; diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsFragment.java index d00f561e0..636d88e16 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsFragment.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsFragment.java @@ -81,7 +81,7 @@ public class RemediationInstructionsFragment extends ListFragment { super.onStart(); - boolean two_pane = getFragmentManager().findFragmentById(R.id.remediation_instruction_fragment) != null; + boolean two_pane = getParentFragmentManager().findFragmentById(R.id.remediation_instruction_fragment) != null; if (two_pane) { /* two-pane layout, make list items selectable */ getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);