mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-31 06:05:12 +00:00
Code Issues Releases Wiki Activity

Use the right context and SwitchCompat

Browse Source 
As suggested by the Android guys here:

https://issuetracker.google.com/issues/118392630
This commit is contained in:
Albert Vaca
2018-10-27 23:08:35 +02:00
parent 1132ee2814
commit 28a8f2131b
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
View File

@@ -5,11 +5,10 @@ import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.CheckBoxPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat; import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.support.v7.preference.TwoStatePreference; import android.support.v7.preference.TwoStatePreference;
import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.BackgroundService;
@@ -28,19 +27,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
super.onDestroy(); super.onDestroy();
} }
private TwoStatePreference createTwoStatePreferenceCompat(Context context) {
//SwitchPreference doesn't work on Android 6
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
return new SwitchPreference(context);
} else {
return new CheckBoxPreference(context);
}
}
@Override @Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
mainActivity = (MainActivity)getActivity(); mainActivity = (MainActivity)getActivity();
Context context = mainActivity; Context context = getPreferenceManager().getContext();
PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(context); PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -65,7 +56,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
// Dark mode // Dark mode
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
final TwoStatePreference darkThemeSwitch = createTwoStatePreferenceCompat(context); final TwoStatePreference darkThemeSwitch = new SwitchPreferenceCompat(context);
darkThemeSwitch.setPersistent(false); darkThemeSwitch.setPersistent(false);
darkThemeSwitch.setChecked(ThemeUtil.shouldUseDarkTheme(context)); darkThemeSwitch.setChecked(ThemeUtil.shouldUseDarkTheme(context));
darkThemeSwitch.setTitle(R.string.settings_dark_mode); darkThemeSwitch.setTitle(R.string.settings_dark_mode);
@@ -84,7 +75,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
} }
// Persistent notification toggle // Persistent notification toggle
final TwoStatePreference notificationSwitch = createTwoStatePreferenceCompat(context); final TwoStatePreference notificationSwitch = new SwitchPreferenceCompat(context);
notificationSwitch.setPersistent(false); notificationSwitch.setPersistent(false);
notificationSwitch.setChecked(NotificationHelper.isPersistentNotificationEnabled(context)); notificationSwitch.setChecked(NotificationHelper.isPersistentNotificationEnabled(context));
notificationSwitch.setTitle(R.string.setting_persistent_notification); notificationSwitch.setTitle(R.string.setting_persistent_notification);