diff --git a/CHANGELOG.md b/CHANGELOG.md index 5310684b7..35baab24e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +#### Version 0.32.1 +* Fix db deadlock on alarm migration + #### Version 0.32.0 * Initial support for Casio GB-6900B * Increase number of alarms and store them per-device diff --git a/app/build.gradle b/app/build.gradle index 844fe6406..ea2dc9f04 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,8 @@ android { targetSdkVersion 27 // Note: always bump BOTH versionCode and versionName! - versionName "0.32.0" - versionCode 143 + versionName "0.32.1" + versionCode 144 vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java index 5f1cb6733..045ce21f5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java @@ -88,8 +88,7 @@ public class AlarmUtils { Set stringAlarms = prefs.getStringSet(MiBandConst.PREF_MIBAND_ALARMS, new HashSet()); List alarms = new ArrayList<>(stringAlarms.size()); - try { - DBHandler db = GBApplication.acquireDB(); + try (DBHandler db = GBApplication.acquireDB()) { DaoSession daoSession = db.getDaoSession(); User user = DBHelper.getUser(daoSession); Device device = DBHelper.getDevice(gbDevice, daoSession); diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 52f85500c..6210076c0 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -1,5 +1,8 @@ + + Fix db deadlock on alarm migration + Initial support for Casio GB-6900B Increase number of alarms and store them per-device diff --git a/fastlane/metadata/android/en-US/changelogs/144.txt b/fastlane/metadata/android/en-US/changelogs/144.txt new file mode 100644 index 000000000..65cf0e959 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/144.txt @@ -0,0 +1 @@ +* Fix db deadlock on alarm migration \ No newline at end of file