From fbb41ae2a1faa2437f8a5c23a9486445cef32fb4 Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Sun, 23 Aug 2020 14:33:40 +0200
Subject: [PATCH] use requireActivity instead of getActivity

---
 .../openscale/gui/preferences/BluetoothPreferences.java       | 4 ++--
 .../openscale/gui/preferences/BluetoothSettingsFragment.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
index 89196874..49bb2842 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
@@ -65,7 +65,7 @@ public class BluetoothPreferences extends PreferenceFragmentCompat {
             @Override
             public boolean onPreferenceClick(Preference preference) {
                 NavDirections action = BluetoothPreferencesDirections.actionNavBluetoothPreferencesToNavBluetoothSettings();
-                Navigation.findNavController(getActivity(), R.id.nav_host_fragment).navigate(action);
+                Navigation.findNavController(requireActivity(), R.id.nav_host_fragment).navigate(action);
                 return true;
             }
         });
@@ -79,7 +79,7 @@ public class BluetoothPreferences extends PreferenceFragmentCompat {
 
         View view = super.onCreateView(inflater, container, savedInstanceState);
 
-        Navigation.findNavController(getActivity(), R.id.nav_host_fragment).getCurrentBackStackEntry().getSavedStateHandle().getLiveData("update", false).observe(getViewLifecycleOwner(), new Observer<Boolean>() {
+        Navigation.findNavController(requireActivity(), R.id.nav_host_fragment).getCurrentBackStackEntry().getSavedStateHandle().getLiveData("update", false).observe(getViewLifecycleOwner(), new Observer<Boolean>() {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
index 63bbcba5..b1870bd7 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
@@ -352,8 +352,8 @@ public class BluetoothSettingsFragment extends Fragment {
             Timber.d("Saved Bluetooth device " + device.getName() + " with address " + device.getAddress());
 
             stopBluetoothDiscovery();
-            Navigation.findNavController(getActivity(), R.id.nav_host_fragment).getPreviousBackStackEntry().getSavedStateHandle().set("update", true);
-            Navigation.findNavController(getActivity(), R.id.nav_host_fragment).navigateUp();
+            Navigation.findNavController(requireActivity(), R.id.nav_host_fragment).getPreviousBackStackEntry().getSavedStateHandle().set("update", true);
+            Navigation.findNavController(requireActivity(), R.id.nav_host_fragment).navigateUp();
         }
     }