MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-09-26 16:26:52 +02:00
Code Releases Wiki Activity

Merge branch 'master' into black_whitelist_for_notifications

Browse Source
This commit is contained in:
cpfeiffer 2019-01-16 23:49:15 +01:00
commit 0b0d18dd9f
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -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

4
app/build.gradle
View File

@ -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 {

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java
View File

@ -88,8 +88,7 @@ public class AlarmUtils {
Set<String> stringAlarms = prefs.getStringSet(MiBandConst.PREF_MIBAND_ALARMS, new HashSet<String>());
List<Alarm> 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);

3
app/src/main/res/xml/changelog_master.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
<release version="0.32.1" versioncode="144">
<change>Fix db deadlock on alarm migration</change>
</release>
<release version="0.32.0" versioncode="143">
<change>Initial support for Casio GB-6900B</change>
<change>Increase number of alarms and store them per-device </change>

1
fastlane/metadata/android/en-US/changelogs/144.txt Normal file
View File

@ -0,0 +1 @@
* Fix db deadlock on alarm migration