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

Remove HabitNotFound exception from WidgetPreferences

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-01-02 05:27:17 -06:00
parent 2171d582dc
commit b2e7c9fe6e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
View File

@@ -390,9 +390,11 @@ public class Preferences
putString(key, StringUtils.joinLongs(values)); putString(key, StringUtils.joinLongs(values));
} }
default long[] getLongArray(String key) default long[] getLongArray(String key, long[] defValue)
{ {
return StringUtils.splitLongs(getString(key, "")); String string = getString(key, "");
if (string.isEmpty()) return defValue;
else return StringUtils.splitLongs(string);
} }
} }
} }

5
android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java
View File

@@ -38,10 +38,10 @@ public class WidgetPreferences {
} }
public long[] getHabitIdsFromWidgetId(int widgetId) { public long[] getHabitIdsFromWidgetId(int widgetId) {
long habitIds[]; long[] habitIds;
String habitIdKey = getHabitIdKey(widgetId); String habitIdKey = getHabitIdKey(widgetId);
try { try {
habitIds = storage.getLongArray(habitIdKey); habitIds = storage.getLongArray(habitIdKey, new long[]{-1});
} catch (ClassCastException e) { } catch (ClassCastException e) {
// 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.
@@ -49,7 +49,6 @@ public class WidgetPreferences {
habitIds[0] = storage.getLong(habitIdKey, -1); habitIds[0] = storage.getLong(habitIdKey, -1);
storage.putLongArray(habitIdKey, habitIds); storage.putLongArray(habitIdKey, habitIds);
} }
if (habitIds.length == 0) throw new HabitNotFoundException();
return habitIds; return habitIds;
} }