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 829bffc3b..5fc761a78 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt +++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt @@ -163,6 +163,9 @@ class Upgrader @Inject constructor( } else { setInstallDetails(to) } + if (preferences.deviceInstallVersion == 0) { + preferences.deviceInstallVersion = from + } preferences.lastSubscribeRequest -= TimeUnit.DAYS.toMillis(7) preferences.setCurrentVersion(to) } @@ -170,6 +173,7 @@ class Upgrader @Inject constructor( private fun setInstallDetails(version: Int) { preferences.installVersion = version preferences.installDate = currentTimeMillis() + preferences.deviceInstallVersion = version } private fun run(from: Int, version: Int, runnable: suspend () -> Unit) { diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt index fcd76829a..33d342e87 100644 --- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt +++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt @@ -475,7 +475,8 @@ class TasksJsonImporter @Inject constructor( } private val ignorePrefs = intArrayOf( R.string.p_current_version, - R.string.p_backups_android_backup_last + R.string.p_backups_android_backup_last, + R.string.p_device_install_version, ) } } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 9df6a995c..f7b7185eb 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -343,6 +343,10 @@ class Preferences @JvmOverloads constructor( get() = getLong(R.string.p_install_date, 0L) set(value) = setLong(R.string.p_install_date, value) + var deviceInstallVersion: Int + get() = getInt(R.string.p_device_install_version, 0) + set(value) = setInt(R.string.p_device_install_version, value) + override var sortMode: Int get() = getInt(R.string.p_sort_mode, SortHelper.SORT_DUE) set(value) { setInt(R.string.p_sort_mode, value) } diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 275cb21d5..7048d0568 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -398,6 +398,7 @@ cv install_version install_date + device_install_version default_location warn_notifications_disabled warn_alarms_disabled