From 459f6baf0823bfd4e43696cb1df2d93c4b8e8664 Mon Sep 17 00:00:00 2001
From: danielegobbetti <daniele+github@gobbetti.name>
Date: Sun, 6 Mar 2016 17:28:21 +0100
Subject: [PATCH] Fix missing column in the creation script (upgrades were
 fine, but new installation weren't). Reindent changelog file.

---
 .../schema/ActivityDBCreationScript.java        |  2 ++
 app/src/main/res/xml/changelog_master.xml       | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/ActivityDBCreationScript.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/ActivityDBCreationScript.java
index 9aa67c862..20c4ac5b7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/ActivityDBCreationScript.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/ActivityDBCreationScript.java
@@ -4,6 +4,7 @@ import android.database.sqlite.SQLiteDatabase;
 
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 
+import static nodomain.freeyourgadget.gadgetbridge.database.DBConstants.KEY_CUSTOM_SHORT;
 import static nodomain.freeyourgadget.gadgetbridge.database.DBConstants.KEY_INTENSITY;
 import static nodomain.freeyourgadget.gadgetbridge.database.DBConstants.KEY_PROVIDER;
 import static nodomain.freeyourgadget.gadgetbridge.database.DBConstants.KEY_STEPS;
@@ -19,6 +20,7 @@ public class ActivityDBCreationScript {
                 + KEY_INTENSITY + " SMALLINT,"
                 + KEY_STEPS + " TINYINT,"
                 + KEY_TYPE + " TINYINT,"
+                + KEY_CUSTOM_SHORT + " INT,"
                 + " PRIMARY KEY (" + KEY_TIMESTAMP + "," + KEY_PROVIDER + ") ON CONFLICT REPLACE)" + DBHelper.getWithoutRowId();
         db.execSQL(CREATE_GBACTIVITYSAMPLES_TABLE);
     }
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 51aac97f2..dc0624dc4 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="0.8.1" versioncode="42" >
-	<change>Pebble: Install and start freshly-installed apps on the watch also in FW 3.x (now same behaviour as 2.x)</change>
-	<change>Pebble: Fix crash while receiving Health data</change>
-	<change>Mi Band 1S: Support for synchronizing activity data</change>
-	<change>Mi Band 1S: Support for reading the heart rate via the "Debug Screen"</change>
+    <release version="next">
+        <change>Fix database creation script. Thanks @feclare</change>
+    </release>
+    <release
+        version="0.8.1"
+        versioncode="42">
+        <change>Pebble: Install and start freshly-installed apps on the watch also in FW 3.x (now
+            same behaviour as 2.x)
+        </change>
+        <change>Pebble: Fix crash while receiving Health data</change>
+        <change>Mi Band 1S: Support for synchronizing activity data</change>
+        <change>Mi Band 1S: Support for reading the heart rate via the "Debug Screen"</change>
     </release>
 </changelog>