From 8f0a407db9e54514535d55f3d49216574acc2b29 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 24 Feb 2020 14:29:11 +0100
Subject: [PATCH] bump version, add changelog, commit missing file

---
 CHANGELOG.md                                          | 4 ++++
 app/build.gradle                                      | 4 ++--
 app/src/main/res/xml/changelog_master.xml             | 4 ++++
 app/src/main/res/xml/devicesettings_sync_calendar.xml | 8 ++++++++
 fastlane/metadata/android/en-US/changelogs/168.txt    | 2 ++
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_sync_calendar.xml
 create mode 100644 fastlane/metadata/android/en-US/changelogs/168.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e2e9014d..99c2ca323 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Changelog
 
+#### Version 0.42.1
+* Fix accepting/rejecting calls on Android 9
+* Mi Band 3/4, Amazfit Bip/Cor/GTS/GTR: Option to sync calender events as reminder
+
 #### Version 0.42.0
 * Initial iTag support
 * Fix indefinitely lasting bluetooth scans when location permission has not been granted
diff --git a/app/build.gradle b/app/build.gradle
index a1b545e45..cb0ec42ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         targetSdkVersion 28
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.42.0"
-        versionCode 167
+        versionName "0.42.1"
+        versionCode 168
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index c9deff023..5f6349d9b 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.42.1" versioncode="168">
+        <change>Fix accepting/rejecting calls on Android 9</change>
+        <change>Mi Band 3/4, Amazfit Bip/Cor/GTS/GTR: Option to sync calender events as reminder</change>
+    </release>
     <release version="0.42.0" versioncode="167">
         <change>Initial iTag support</change>
         <change>Fix indefinitely lasting bluetooth scans when location permission has not been granted</change>
diff --git a/app/src/main/res/xml/devicesettings_sync_calendar.xml b/app/src/main/res/xml/devicesettings_sync_calendar.xml
new file mode 100644
index 000000000..58c66b1b9
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_sync_calendar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="sync_calendar"
+        android:summary="@string/pref_summary_sync_calendar"
+        android:title="@string/pref_title_sync_caldendar" />
+</androidx.preference.PreferenceScreen>
diff --git a/fastlane/metadata/android/en-US/changelogs/168.txt b/fastlane/metadata/android/en-US/changelogs/168.txt
new file mode 100644
index 000000000..087149a1b
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/168.txt
@@ -0,0 +1,2 @@
+* Fix accepting/rejecting calls on Android 9
+* Mi Band 3/4, Amazfit Bip/Cor/GTS/GTR: Option to sync calender events as reminder