diff --git a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java
index c614340a3..83c8fdc75 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java
@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.EditTextPreference;
@@ -71,7 +72,7 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
     }
 
     @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
+    public void onDisplayPreferenceDialog(@NonNull Preference preference) {
         if (preference instanceof BluetoothLeSensorPreference) {
             if(!PermissionRequester.BLUETOOTH.hasPermission(preference.getContext())) {
                 // TODO: maybe use requestPermissionsIfNeeded here or disable preferences at all
@@ -81,6 +82,8 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
             }
 
             DialogFragment dialogFragment = ((BluetoothLeSensorPreference) preference).createInstance();
+
+            // Deprecation not fixed upstream: https://issuetracker.google.com/issues/181793702
             dialogFragment.setTargetFragment(this, 0);
             dialogFragment.show(getParentFragmentManager(), getClass().getSimpleName());
             return;
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserInterfaceSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserInterfaceSettingsFragment.java
index b89de4cf7..b6b228508 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserInterfaceSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserInterfaceSettingsFragment.java
@@ -5,6 +5,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -53,7 +54,7 @@ public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat {
     }
 
     @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
+    public void onDisplayPreferenceDialog(@NonNull Preference preference) {
         DialogFragment dialogFragment = null;
 
         if (preference instanceof ResetDialogPreference) {