forked from upstream-mirrors/OpenTracks
Cleanup.
This commit is contained in:
@@ -4,6 +4,7 @@ import android.os.Bundle;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
import androidx.fragment.app.DialogFragment;
|
import androidx.fragment.app.DialogFragment;
|
||||||
import androidx.fragment.app.FragmentActivity;
|
import androidx.fragment.app.FragmentActivity;
|
||||||
import androidx.preference.EditTextPreference;
|
import androidx.preference.EditTextPreference;
|
||||||
@@ -71,7 +72,7 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisplayPreferenceDialog(Preference preference) {
|
public void onDisplayPreferenceDialog(@NonNull Preference preference) {
|
||||||
if (preference instanceof BluetoothLeSensorPreference) {
|
if (preference instanceof BluetoothLeSensorPreference) {
|
||||||
if(!PermissionRequester.BLUETOOTH.hasPermission(preference.getContext())) {
|
if(!PermissionRequester.BLUETOOTH.hasPermission(preference.getContext())) {
|
||||||
// TODO: maybe use requestPermissionsIfNeeded here or disable preferences at all
|
// TODO: maybe use requestPermissionsIfNeeded here or disable preferences at all
|
||||||
@@ -81,6 +82,8 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
|
|||||||
}
|
}
|
||||||
|
|
||||||
DialogFragment dialogFragment = ((BluetoothLeSensorPreference) preference).createInstance();
|
DialogFragment dialogFragment = ((BluetoothLeSensorPreference) preference).createInstance();
|
||||||
|
|
||||||
|
// Deprecation not fixed upstream: https://issuetracker.google.com/issues/181793702
|
||||||
dialogFragment.setTargetFragment(this, 0);
|
dialogFragment.setTargetFragment(this, 0);
|
||||||
dialogFragment.show(getParentFragmentManager(), getClass().getSimpleName());
|
dialogFragment.show(getParentFragmentManager(), getClass().getSimpleName());
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import android.content.SharedPreferences;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
import androidx.fragment.app.DialogFragment;
|
import androidx.fragment.app.DialogFragment;
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.PreferenceFragmentCompat;
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
@@ -53,7 +54,7 @@ public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisplayPreferenceDialog(Preference preference) {
|
public void onDisplayPreferenceDialog(@NonNull Preference preference) {
|
||||||
DialogFragment dialogFragment = null;
|
DialogFragment dialogFragment = null;
|
||||||
|
|
||||||
if (preference instanceof ResetDialogPreference) {
|
if (preference instanceof ResetDialogPreference) {
|
||||||
|
|||||||
Reference in New Issue
Block a user