From bcf89ed0c342d9ff1091143fa4a796189161a822 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Tue, 1 Nov 2022 12:19:35 +0100
Subject: [PATCH] Version 6.311

---
 app/k9mail/build.gradle                              | 4 ++--
 app/ui/legacy/src/main/res/raw/changelog_master.xml  | 9 +++++++++
 fastlane/metadata/android/en-US/changelogs/33011.txt | 7 +++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/33011.txt

diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index 89193d047..5dabc3d61 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -51,8 +51,8 @@ android {
         applicationId "com.fsck.k9"
         testApplicationId "com.fsck.k9.tests"
 
-        versionCode 33010
-        versionName '6.311-SNAPSHOT'
+        versionCode 33011
+        versionName '6.311'
 
         // Keep in sync with the resource string array 'supported_languages'
         resConfigs "in", "br", "ca", "cs", "cy", "da", "de", "et", "en", "en_GB", "es", "eo", "eu", "fr", "gd", "gl",
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 f582ff2b6..a3de481aa 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,15 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.311" versioncode="33011" date="2022-11-01">
+        <change>Don't unexpectedly show and focus the "reply to" field when composing a message</change>
+        <change>Fixed a bug where sometimes toolbar buttons in the message view would affect another message than the one currently being displayed</change>
+        <change>Changed the way the app switches to the next/previous message to avoid a bug that could lead to the toolbar disappearing</change>
+        <change>Fall back to using IPv4 if connecting to a POP3 server using IPv6 fails</change>
+        <change>SMTP: Stop treating all TLS errors as certificate error</change>
+        <change>Added more (local) logging when creating and removing notifications</change>
+        <change>Fixed a couple of rare crashes</change>
+    </release>
     <release version="6.310" versioncode="33010" date="2022-10-24">
         <change>Fixed "K-9 Accounts" shortcuts (you probably have to remove existing shortcuts and add them again)</change>
         <change>Fixed a couple of bugs and display issues in the message list widget</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/33011.txt b/fastlane/metadata/android/en-US/changelogs/33011.txt
new file mode 100644
index 000000000..60e4ec792
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33011.txt
@@ -0,0 +1,7 @@
+- Don't unexpectedly show and focus the "reply to" field when composing a message
+- Fixed a bug where sometimes toolbar buttons in the message view would affect another message than the one currently being displayed
+- Changed the way the app switches to the next/previous message to avoid a bug that could lead to the toolbar disappearing
+- Fall back to using IPv4 if connecting to a POP3 server using IPv6 fails
+- SMTP: Stop treating all TLS errors as certificate error
+- Added more (local) logging when creating and removing notifications
+- Fixed a couple of rare crashes