From fdd326f16e4c8672ab0d488ccf6472d636f803ca Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 8 Jan 2021 17:37:05 -0600 Subject: [PATCH] Remove chip setting migration --- .../main/java/com/todoroo/astrid/service/Upgrader.kt | 5 ----- .../main/java/org/tasks/preferences/Preferences.kt | 12 ++++-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt index cadb75cb6..23e03ac66 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt +++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt @@ -59,11 +59,6 @@ class Upgrader @Inject constructor( run(from, V8_10) { migrateWidgets() } run(from, V9_3) { applyCaldavOrder() } run(from, V9_6) { - val chips = preferences.getBoolean("show_list_indicators", true) - preferences.showSubtaskChip = chips - preferences.showPlaceChip = chips - preferences.showListChip = chips - preferences.showTagChip = chips preferences.setBoolean(R.string.p_astrid_sort_enabled, true) taskMover.migrateLocalTasks() } diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 61f81eb5d..9ef2f53d4 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -453,21 +453,17 @@ class Preferences @JvmOverloads constructor( val themeBase: Int get() = getInt(R.string.p_theme, ThemeBase.DEFAULT_BASE_THEME) - var showSubtaskChip: Boolean + val showSubtaskChip: Boolean get() = getBoolean(R.string.p_subtask_chips, true) - set(value) = setBoolean(R.string.p_subtask_chips, value) - var showPlaceChip: Boolean + val showPlaceChip: Boolean get() = getBoolean(R.string.p_place_chips, true) - set(value) = setBoolean(R.string.p_place_chips, value) - var showListChip: Boolean + val showListChip: Boolean get() = getBoolean(R.string.p_list_chips, true) - set(value) = setBoolean(R.string.p_list_chips, value) - var showTagChip: Boolean + val showTagChip: Boolean get() = getBoolean(R.string.p_tag_chips, true) - set(value) = setBoolean(R.string.p_tag_chips, value) fun alreadyNotified(account: String?, scope: String?): Boolean = getBoolean(context.getString(R.string.p_notified_oauth_error, account, scope), false)