isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use empty array instead of sentinel value -1 as habitId

Browse Source
This commit is contained in:
Quentin Hibon
2021-08-01 19:32:36 +02:00
parent 67b55a4ecf
commit 91ff5f7a0c
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.kt
View File

@@ -109,7 +109,7 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
} }
protected fun getHabitsFromWidgetId(widgetId: Int): List<Habit> { protected fun getHabitsFromWidgetId(widgetId: Int): List<Habit> {
val selectedIds = widgetPrefs.getHabitIdsFromWidgetId(widgetId)!! val selectedIds = widgetPrefs.getHabitIdsFromWidgetId(widgetId)
val selectedHabits = ArrayList<Habit>(selectedIds.size) val selectedHabits = ArrayList<Habit>(selectedIds.size)
for (id in selectedIds) { for (id in selectedIds) {
val h = habits.getById(id) ?: throw HabitNotFoundException() val h = habits.getById(id) ?: throw HabitNotFoundException()

2
uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt
View File

@@ -95,7 +95,7 @@ class WidgetUpdater
val modifiedWidgetIds = when (modifiedHabitId) { val modifiedWidgetIds = when (modifiedHabitId) {
null -> widgetIds.toList() null -> widgetIds.toList()
else -> widgetIds.filter { w -> else -> widgetIds.filter { w ->
widgetPrefs.getHabitIdsFromWidgetId(w)!!.contains(modifiedHabitId) widgetPrefs.getHabitIdsFromWidgetId(w).contains(modifiedHabitId)
} }
} }

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
View File

@@ -258,7 +258,7 @@ open class Preferences(private val storage: Storage) {
putString(key, joinLongs(values)) putString(key, joinLongs(values))
} }
fun getLongArray(key: String, defValue: LongArray): LongArray? { fun getLongArray(key: String, defValue: LongArray): LongArray {
val string = getString(key, "") val string = getString(key, "")
return if (string.isEmpty()) defValue else splitLongs( return if (string.isEmpty()) defValue else splitLongs(
string string

15
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/WidgetPreferences.kt
View File

@@ -27,19 +27,18 @@ class WidgetPreferences @Inject constructor(private val storage: Preferences.Sto
storage.putLongArray(getHabitIdKey(widgetId), habitIds) storage.putLongArray(getHabitIdKey(widgetId), habitIds)
} }
fun getHabitIdsFromWidgetId(widgetId: Int): LongArray? { fun getHabitIdsFromWidgetId(widgetId: Int): LongArray {
var habitIds: LongArray?
val habitIdKey = getHabitIdKey(widgetId) val habitIdKey = getHabitIdKey(widgetId)
try { return try {
habitIds = storage.getLongArray(habitIdKey, longArrayOf(-1)) storage.getLongArray(habitIdKey, longArrayOf())
} catch (e: ClassCastException) { } catch (e: ClassCastException) {
// Up to Loop 1.7.11, this preference was not an array, but a single // Up to Loop 1.7.11, this preference was not an array, but a single
// long. Trying to read the old preference causes a cast exception. // long. Trying to read the old preference causes a cast exception.
habitIds = LongArray(1) when (val habitId = storage.getLong(habitIdKey, -1)) {
habitIds[0] = storage.getLong(habitIdKey, -1) -1L -> longArrayOf()
storage.putLongArray(habitIdKey, habitIds) else -> longArrayOf(habitId)
}
} }
return habitIds
} }
fun removeWidget(id: Int) { fun removeWidget(id: Int) {