mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-17 14:10:54 +02:00
Code Issues Releases Wiki Activity

use requireActivity instead of getActivity

Browse Source
This commit is contained in:
oliexdev
2020-08-23 14:33:40 +02:00
parent 3698773ae2
commit fbb41ae2a1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
View File

@@ -65,7 +65,7 @@ public class BluetoothPreferences extends PreferenceFragmentCompat {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
NavDirections action = BluetoothPreferencesDirections.actionNavBluetoothPreferencesToNavBluetoothSettings(); 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; return true;
} }
}); });
@@ -79,7 +79,7 @@ public class BluetoothPreferences extends PreferenceFragmentCompat {
View view = super.onCreateView(inflater, container, savedInstanceState); 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 @Override
public void onChanged(Boolean aBoolean) { public void onChanged(Boolean aBoolean) {
if (aBoolean) { if (aBoolean) {

4
android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
View File

@@ -352,8 +352,8 @@ public class BluetoothSettingsFragment extends Fragment {
Timber.d("Saved Bluetooth device " + device.getName() + " with address " + device.getAddress()); Timber.d("Saved Bluetooth device " + device.getName() + " with address " + device.getAddress());
stopBluetoothDiscovery(); stopBluetoothDiscovery();
Navigation.findNavController(getActivity(), R.id.nav_host_fragment).getPreviousBackStackEntry().getSavedStateHandle().set("update", true); Navigation.findNavController(requireActivity(), 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).navigateUp();
} }
} }