From 26275b85707c8fd3ffcb3f2995be26fa3e325b08 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 17 Aug 2016 09:22:28 -0500 Subject: [PATCH] Ignore deprecated code in preferences --- .../astrid/gtasks/GtasksPreferences.java | 4 ++-- .../java/org/tasks/dialogs/DialogBuilder.java | 1 - .../InjectingPreferenceActivity.java | 24 +++++++++++++++---- .../tasks/preferences/BackupPreferences.java | 4 ++-- .../tasks/preferences/BasicPreferences.java | 18 +++++++------- .../preferences/HelpAndFeedbackActivity.java | 4 ---- .../tasks/widget/WidgetConfigActivity.java | 22 ++++++++--------- 7 files changed, 44 insertions(+), 33 deletions(-) diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java index 6b7988dc8..383eae8f3 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -91,7 +91,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go .show(); return true; }); - getPref(R.string.p_gtasks_default_list).setOnPreferenceClickListener(preference -> { + findPreference(R.string.p_gtasks_default_list).setOnPreferenceClickListener(preference -> { new NativeGoogleTaskListPicker() .show(getFragmentManager(), FRAG_TAG_GOOGLE_TASK_LIST_SELECTION); return false; @@ -144,7 +144,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go private void updateDefaultGoogleTaskList() { GtasksList list = gtasksListService.getList(gtasksPreferenceService.getDefaultList()); if (list != null) { - getPref(R.string.p_gtasks_default_list).setSummary(list.getName()); + findPreference(R.string.p_gtasks_default_list).setSummary(list.getName()); } } } diff --git a/src/main/java/org/tasks/dialogs/DialogBuilder.java b/src/main/java/org/tasks/dialogs/DialogBuilder.java index 9aa27d71b..1cd851a9b 100644 --- a/src/main/java/org/tasks/dialogs/DialogBuilder.java +++ b/src/main/java/org/tasks/dialogs/DialogBuilder.java @@ -31,7 +31,6 @@ public class DialogBuilder { return new AlertDialogBuilder(activity, theme, locale); } - @Deprecated public AlertDialogBuilder newMessageDialog(int message, Object... formatArgs) { return newDialog().setMessage(message, formatArgs); } diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java index 8a628a229..edf9a1b46 100644 --- a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java +++ b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java @@ -77,17 +77,33 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct protected void requires(boolean passesCheck, int... resIds) { if (!passesCheck) { - remove(getPreferenceScreen(), resIds); + remove(resIds); } } - private void remove(PreferenceGroup preferenceGroup, int[] resIds) { + protected void remove(int... resIds) { + //noinspection deprecation + remove(getPreferenceScreen(), resIds); + } + + protected void remove(PreferenceGroup preferenceGroup, int[] resIds) { for (int resId : resIds) { - preferenceGroup.removePreference(getPref(resId)); + preferenceGroup.removePreference(findPreference(resId)); } } - protected Preference getPref(int resId) { + @SuppressWarnings("deprecation") + @Override + public void addPreferencesFromResource(int preferencesResId) { + super.addPreferencesFromResource(preferencesResId); + } + + protected Preference findPreference(int resId) { return findPreference(getString(resId)); } + + protected Preference findPreference(String key) { + //noinspection deprecation + return super.findPreference(key); + } } diff --git a/src/main/java/org/tasks/preferences/BackupPreferences.java b/src/main/java/org/tasks/preferences/BackupPreferences.java index f4022f659..3e5bce328 100644 --- a/src/main/java/org/tasks/preferences/BackupPreferences.java +++ b/src/main/java/org/tasks/preferences/BackupPreferences.java @@ -30,14 +30,14 @@ public class BackupPreferences extends InjectingPreferenceActivity { addPreferencesFromResource(R.xml.preferences_backup); - getPref(R.string.backup_BAc_import).setOnPreferenceClickListener(preference -> { + findPreference(R.string.backup_BAc_import).setOnPreferenceClickListener(preference -> { startActivityForResult(new Intent(BackupPreferences.this, FileExplore.class) {{ putExtra(FileExplore.EXTRA_START_PATH, preferences.getBackupDirectory().getAbsolutePath()); }}, REQUEST_PICKER); return false; }); - getPref(R.string.backup_BAc_export).setOnPreferenceClickListener(preference -> { + findPreference(R.string.backup_BAc_export).setOnPreferenceClickListener(preference -> { newExportTasksDialog().show(getFragmentManager(), FRAG_TAG_EXPORT_TASKS); return false; }); diff --git a/src/main/java/org/tasks/preferences/BasicPreferences.java b/src/main/java/org/tasks/preferences/BasicPreferences.java index bd139008f..557ba2b4c 100644 --- a/src/main/java/org/tasks/preferences/BasicPreferences.java +++ b/src/main/java/org/tasks/preferences/BasicPreferences.java @@ -127,7 +127,7 @@ public class BasicPreferences extends InjectingPreferenceActivity implements return false; }); - getPref(R.string.TLA_menu_donate).setOnPreferenceClickListener(preference -> { + findPreference(R.string.TLA_menu_donate).setOnPreferenceClickListener(preference -> { if (BuildConfig.FLAVOR_store.equals("googleplay")) { newDonationDialog().show(getFragmentManager(), FRAG_TAG_DONATION); } else { @@ -136,14 +136,14 @@ public class BasicPreferences extends InjectingPreferenceActivity implements return false; }); - getPref(R.string.p_purchased_themes).setOnPreferenceChangeListener((preference, newValue) -> { + findPreference(R.string.p_purchased_themes).setOnPreferenceChangeListener((preference, newValue) -> { if (newValue != null && (boolean) newValue && !preferences.hasPurchase(R.string.p_purchased_themes)) { purchaseHelper.purchase(dialogBuilder, BasicPreferences.this, getString(R.string.sku_themes), getString(R.string.p_purchased_themes), REQUEST_PURCHASE, BasicPreferences.this); } return false; }); - getPref(R.string.p_tesla_unread_enabled).setOnPreferenceChangeListener((preference, newValue) -> { + findPreference(R.string.p_tesla_unread_enabled).setOnPreferenceChangeListener((preference, newValue) -> { if (newValue != null) { if ((boolean) newValue && !preferences.hasPurchase(R.string.p_purchased_tesla_unread)) { purchaseHelper.purchase(dialogBuilder, BasicPreferences.this, getString(R.string.sku_tesla_unread), getString(R.string.p_purchased_tesla_unread), REQUEST_PURCHASE, BasicPreferences.this); @@ -155,14 +155,14 @@ public class BasicPreferences extends InjectingPreferenceActivity implements return false; }); - getPref(R.string.p_purchased_tasker).setOnPreferenceChangeListener((preference, newValue) -> { + findPreference(R.string.p_purchased_tasker).setOnPreferenceChangeListener((preference, newValue) -> { if (newValue != null && (boolean) newValue && !preferences.hasPurchase(R.string.p_purchased_tasker)) { purchaseHelper.purchase(dialogBuilder, BasicPreferences.this, getString(R.string.sku_tasker), getString(R.string.p_purchased_tasker), REQUEST_PURCHASE, BasicPreferences.this); } return false; }); - getPref(R.string.p_purchased_dashclock).setOnPreferenceChangeListener((preference, newValue) -> { + findPreference(R.string.p_purchased_dashclock).setOnPreferenceChangeListener((preference, newValue) -> { if (newValue != null && (boolean) newValue && !preferences.hasPurchase(R.string.p_purchased_dashclock)) { purchaseHelper.purchase(dialogBuilder, BasicPreferences.this, getString(R.string.sku_dashclock), getString(R.string.p_purchased_dashclock), REQUEST_PURCHASE, BasicPreferences.this); } @@ -293,13 +293,13 @@ public class BasicPreferences extends InjectingPreferenceActivity implements public void purchaseCompleted(final boolean success, final String sku) { runOnUiThread(() -> { if (getString(R.string.sku_tasker).equals(sku)) { - ((TwoStatePreference) getPref(R.string.p_purchased_tasker)).setChecked(success); + ((TwoStatePreference) findPreference(R.string.p_purchased_tasker)).setChecked(success); } else if (getString(R.string.sku_tesla_unread).equals(sku)) { - ((TwoStatePreference) getPref(R.string.p_tesla_unread_enabled)).setChecked(success); + ((TwoStatePreference) findPreference(R.string.p_tesla_unread_enabled)).setChecked(success); } else if (getString(R.string.sku_dashclock).equals(sku)) { - ((TwoStatePreference) getPref(R.string.p_purchased_dashclock)).setChecked(success); + ((TwoStatePreference) findPreference(R.string.p_purchased_dashclock)).setChecked(success); } else if (getString(R.string.sku_themes).equals(sku)) { - ((TwoStatePreference) getPref(R.string.p_purchased_themes)).setChecked(success); + ((TwoStatePreference) findPreference(R.string.p_purchased_themes)).setChecked(success); } else { Timber.d("Unhandled sku: %s", sku); } diff --git a/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java b/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java index 49d04d99f..aa0365444 100644 --- a/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java +++ b/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java @@ -31,10 +31,6 @@ public class HelpAndFeedbackActivity extends InjectingPreferenceActivity { } } - private void remove(int resId) { - getPreferenceScreen().removePreference(findPreference(getString(resId))); - } - @Override public void inject(ActivityComponent component) { component.inject(this); diff --git a/src/main/java/org/tasks/widget/WidgetConfigActivity.java b/src/main/java/org/tasks/widget/WidgetConfigActivity.java index d18b43204..7b86a6565 100644 --- a/src/main/java/org/tasks/widget/WidgetConfigActivity.java +++ b/src/main/java/org/tasks/widget/WidgetConfigActivity.java @@ -75,21 +75,21 @@ public class WidgetConfigActivity extends InjectingPreferenceActivity implements CheckBoxPreference showSettings = setupCheckbox(R.string.p_widget_show_settings); showSettings.setDependency(showHeader.getKey()); - getPref(R.string.p_widget_filter).setOnPreferenceClickListener(preference -> { + findPreference(R.string.p_widget_filter).setOnPreferenceClickListener(preference -> { startActivityForResult(new Intent(WidgetConfigActivity.this, FilterSelectionActivity.class) {{ putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true); }}, REQUEST_FILTER); return false; }); - getPref(R.string.p_widget_theme).setOnPreferenceClickListener(preference -> { + findPreference(R.string.p_widget_theme).setOnPreferenceClickListener(preference -> { startActivityForResult(new Intent(WidgetConfigActivity.this, ColorPickerActivity.class) {{ putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPickerDialog.ColorPalette.WIDGET_BACKGROUND); }}, REQUEST_THEME_SELECTION); return false; }); - Preference colorPreference = getPref(R.string.p_widget_color); + Preference colorPreference = findPreference(R.string.p_widget_color); colorPreference.setDependency(showHeader.getKey()); colorPreference.setOnPreferenceClickListener(preference -> { startActivityForResult(new Intent(WidgetConfigActivity.this, ColorPickerActivity.class) {{ @@ -98,13 +98,13 @@ public class WidgetConfigActivity extends InjectingPreferenceActivity implements return false; }); - getPref(R.string.p_widget_opacity).setOnPreferenceClickListener(preference -> { + findPreference(R.string.p_widget_opacity).setOnPreferenceClickListener(preference -> { newSeekBarDialog(R.layout.dialog_opacity_seekbar, 0, 100, widgetPreferences.getOpacity(), REQUEST_OPACITY) .show(getFragmentManager(), FRAG_TAG_OPACITY_SEEKBAR); return false; }); - getPref(R.string.p_widget_font_size).setOnPreferenceClickListener(preference -> { + findPreference(R.string.p_widget_font_size).setOnPreferenceClickListener(preference -> { newSeekBarDialog(R.layout.dialog_font_size_seekbar, 10, 22, widgetPreferences.getFontSize(), REQUEST_FONT_SIZE) .show(getFragmentManager(), FRAG_TAG_FONT_SIZE_SEEKBAR); return false; @@ -118,7 +118,7 @@ public class WidgetConfigActivity extends InjectingPreferenceActivity implements } private CheckBoxPreference setupCheckbox(int resId) { - CheckBoxPreference preference = (CheckBoxPreference) getPref(resId); + CheckBoxPreference preference = (CheckBoxPreference) findPreference(resId); String key = getString(resId) + appWidgetId; preference.setKey(key); preference.setChecked(preferences.getBoolean(key, true)); @@ -127,27 +127,27 @@ public class WidgetConfigActivity extends InjectingPreferenceActivity implements private void updateOpacity() { int opacity = widgetPreferences.getOpacity(); - getPref(R.string.p_widget_opacity).setSummary(locale.formatPercentage(opacity)); + findPreference(R.string.p_widget_opacity).setSummary(locale.formatPercentage(opacity)); } private void updateFontSize() { int fontSize = widgetPreferences.getFontSize(); - getPref(R.string.p_widget_font_size).setSummary(locale.formatNumber(fontSize)); + findPreference(R.string.p_widget_font_size).setSummary(locale.formatNumber(fontSize)); } private void updateFilter() { Filter filter = defaultFilterProvider.getFilterFromPreference(widgetPreferences.getFilterId()); - getPref(R.string.p_widget_filter).setSummary(filter.listingTitle); + findPreference(R.string.p_widget_filter).setSummary(filter.listingTitle); } private void updateTheme() { WidgetTheme widgetTheme = themeCache.getWidgetTheme(widgetPreferences.getThemeIndex()); - getPref(R.string.p_widget_theme).setSummary(widgetTheme.getName()); + findPreference(R.string.p_widget_theme).setSummary(widgetTheme.getName()); } private void updateColor() { ThemeColor themeColor = themeCache.getThemeColor(widgetPreferences.getColorIndex()); - getPref(R.string.p_widget_color).setSummary(themeColor.getName()); + findPreference(R.string.p_widget_color).setSummary(themeColor.getName()); } @Override