From 0d54e9e197e5b81202c1fcc2069f1f15188c1027 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Wed, 29 Nov 2023 20:36:20 +0100
Subject: [PATCH] Version 6.712

---
 app/k9mail/build.gradle.kts                       |  4 ++--
 .../legacy/src/main/res/raw/changelog_master.xml  | 15 +++++++++++++++
 .../metadata/android/en-US/changelogs/37012.txt   | 13 +++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/37012.txt

diff --git a/app/k9mail/build.gradle.kts b/app/k9mail/build.gradle.kts
index 327b040bfbb..8dd959bd9d7 100644
--- a/app/k9mail/build.gradle.kts
+++ b/app/k9mail/build.gradle.kts
@@ -50,8 +50,8 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 37011
-        versionName = "6.712-SNAPSHOT"
+        versionCode = 37012
+        versionName = "6.712"
 
         // Keep in sync with the resource string array "supported_languages"
         resourceConfigurations.addAll(
diff --git a/app/ui/legacy/src/main/res/raw/changelog_master.xml b/app/ui/legacy/src/main/res/raw/changelog_master.xml
index e73a76ffbea..50916034378 100644
--- a/app/ui/legacy/src/main/res/raw/changelog_master.xml
+++ b/app/ui/legacy/src/main/res/raw/changelog_master.xml
@@ -5,6 +5,21 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.712" versioncode="37012" date="2023-11-30">
+        <change>New server settings screens are now also used when editing an existing account</change>
+        <change>Made it harder to accidentally trigger swipe actions in the message list screen</change>
+        <change>Added option to return to the message list after marking a message as unread in the message view</change>
+        <change>Combined settings "Return to list after delete" and "Show next message after delete" into "After deleting or moving a message"</change>
+        <change>Added screen to ask for Android permissions in the onboarding flow</change>
+        <change>Added support for the IMAP MOVE extension</change>
+        <change>Tweaked setup theme to more closely match the rest of the app</change>
+        <change>Fixed notification sounds on WearOS devices</change>
+        <change>Fixed crash when entering an unsupported email address during account setup</change>
+        <change>Fixed crash when MX lookup during account setup returns an invalid host name</change>
+        <change>Respect app theme and language settings in new account setup</change>
+        <change>Set hints for software keyboards not to use auto-correct in server settings text fields</change>
+        <change>Updated translations</change>
+    </release>
     <release version="6.711" versioncode="37011" date="2023-10-04">
         <change>Simplified the app icon so it can be a vector drawable</change>
         <change>Improved screen reader experience in various places</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/37012.txt b/fastlane/metadata/android/en-US/changelogs/37012.txt
new file mode 100644
index 00000000000..9d74359a320
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/37012.txt
@@ -0,0 +1,13 @@
+- New server settings screens are now also used when editing an existing account
+- Made it harder to accidentally trigger swipe actions in the message list screen
+- Added option to return to the message list after marking a message as unread in the message view
+- Combined settings "Return to list after delete" and "Show next message after delete" into "After deleting or moving a message"
+- Added screen to ask for Android permissions in the onboarding flow
+- Added support for the IMAP MOVE extension
+- Tweaked setup theme to more closely match the rest of the app
+- Fixed notification sounds on WearOS devices
+- Fixed crash when entering an unsupported email address during account setup
+- Fixed crash when MX lookup during account setup returns an invalid host name
+- Respect app theme and language settings in new account setup
+- Set hints for software keyboards not to use auto-correct in server settings text fields
+- Updated translations