From 884c4262cf1a3ce62df3b963bd9560b9284c1237 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 23 May 2016 23:37:08 +0200
Subject: [PATCH] update changelog, bump version

(also change one German string and remove two newlines :P)
---
 CHANGELOG.md                                              | 8 ++++++++
 app/build.gradle                                          | 4 ++--
 .../gadgetbridge/activities/AppManagerActivity.java       | 2 --
 app/src/main/res/values-de/strings.xml                    | 2 +-
 app/src/main/res/xml/changelog_master.xml                 | 8 ++++++++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf801f266..91ce3b0ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,12 @@
 ###Changelog
+####Version 0.9.8
+* Pebble: fix more reconnnect issues
+* Pebble: fix deep sleep not being detected with Firmware 3.12 when using Pebble Health
+* Pebble: option in AppManager to delete files from cache
+* Pebble: enable pbw cache and watchface configuration for Firmware 2.x
+* Pebble: allow enabling of Pebble Health without "untested features" being enabled
+* Honour "Do Not Disturb" for phone calls and SMS
+
 ####Version 0.9.7
 * Pebble: hopefully fix some reconnect issues
 * Mi Band: fix live activity monitoring running forever if back button pressed
diff --git a/app/build.gradle b/app/build.gradle
index fffe7f3cb..c30ca034c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.9.7"
-        versionCode 51
+        versionName "0.9.8"
+        versionCode 52
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
index 9c0fd166d..5f7e5af89 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
@@ -212,8 +212,6 @@ public class AppManagerActivity extends GBActivity {
         switch (item.getItemId()) {
             case R.id.appmanager_health_deactivate:
             case R.id.appmanager_app_delete_cache:
-
-
                 String baseName;
                 try {
                     baseName = FileUtils.getExternalFilesDir().getPath() + "/pbw-cache/" + selectedApp.getUUID();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5baa517cd..1588000a9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -207,7 +207,7 @@
   <string name="fwinstaller_firmware_not_compatible_to_device">Diese Firmware ist nicht mit dem Gerät kompatibel</string>
   <string name="miband_prefs_reserve_alarm_calendar">Wecker für zukünftige Ereignisse vormerken</string>
   <string name="miband_prefs_hr_sleep_detection">Verwende den Herzfrequenzsensor um die Schlaferkennung zu verbessern</string>
-  <string name="waiting_for_reconnect">warte auf eingehende Verbindung</string>
+  <string name="waiting_for_reconnect">warte auf Verbindung</string>
   <string name="appmananger_app_reinstall">Erneut installieren</string>
   <string name="activity_prefs_about_you">Über Dich</string>
   <string name="activity_prefs_year_birth">Geburtsjahr</string>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 425e5c4a0..abe77ebae 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.9.8" versioncode="52">
+        <change>Pebble: fix more reconnnect issues</change>
+        <change>Pebble: fix deep sleep not being detected with Firmware 3.12 when using Pebble Health</change>
+        <change>Pebble: option in AppManager to delete files from cache</change>
+        <change>Pebble: enable pbw cache and watchface configuration for Firmware 2.x</change>
+        <change>Pebble: allow enabling of Pebble Health without "untested features" being enabled</change>
+        <change>Honour "Do Not Disturb" for phone calls and SMS</change>
+    </release>
     <release version="0.9.7" versioncode="51">
 	<change>Pebble: hopefully fix some reconnect issues</change>
 	<change>Mi Band: fix live activity monitoring running forever if back button pressed</change>