From 21890f977d79a6584ba817e40ad7e63bb5ca4aee Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 20:10:15 +0000
Subject: [PATCH] Release: Thunderbird Beta 8.0b4

---
 .../en-US/changelogs/7.txt                            |  9 +++++++++
 app-thunderbird/build.gradle.kts                      |  4 ++--
 app-thunderbird/src/main/res/raw/changelog_master.xml | 11 ++++++++++-
 metadata                                              |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 app-metadata/net.thunderbird.android.beta/en-US/changelogs/7.txt

diff --git a/app-metadata/net.thunderbird.android.beta/en-US/changelogs/7.txt b/app-metadata/net.thunderbird.android.beta/en-US/changelogs/7.txt
new file mode 100644
index 00000000000..b852fc579fc
--- /dev/null
+++ b/app-metadata/net.thunderbird.android.beta/en-US/changelogs/7.txt
@@ -0,0 +1,9 @@
+Thunderbird for Android version 8.0b4, based on K-9 Mail. Changes include:
+- Monthly financial contributions are now possible—try it today!
+- Accounts shown by default for better access to settings
+- Added Norsk Nynorsk translations
+- Added unread count to new folder drawer
+- Improved first-time user experience for importing settings
+- Shortened headers to prevent wrapping
+- Correct saving of 'Bcc all messages' setting
+- Better QR code import instructions
\ No newline at end of file
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
index ee22fef62c9..c3ad1a97be7 100644
--- a/app-thunderbird/build.gradle.kts
+++ b/app-thunderbird/build.gradle.kts
@@ -20,7 +20,7 @@ android {
         applicationId = "net.thunderbird.android"
         testApplicationId = "net.thunderbird.android.tests"
 
-        versionCode = 6
+        versionCode = 7
         versionName = "8.0"
 
         // Keep in sync with the resource string array "supported_languages"
@@ -123,7 +123,7 @@ android {
             signingConfig = signingConfigs.getByType(SigningType.TB_BETA)
 
             applicationIdSuffix = ".beta"
-            versionNameSuffix = "b3"
+            versionNameSuffix = "b4"
 
             isMinifyEnabled = true
             isShrinkResources = true
diff --git a/app-thunderbird/src/main/res/raw/changelog_master.xml b/app-thunderbird/src/main/res/raw/changelog_master.xml
index fcfb3417019..ef442ee2dfa 100644
--- a/app-thunderbird/src/main/res/raw/changelog_master.xml
+++ b/app-thunderbird/src/main/res/raw/changelog_master.xml
@@ -5,7 +5,16 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
-    <release version="8.0b3" versioncode="6" date="2024-10-15">
+    <release version="8.0b4" versioncode="7" date="2024-10-21">
+        <change>Monthly financial contributions are now possible—try it today!</change>
+        <change>Accounts shown by default for better access to settings</change>
+        <change>Added Norsk Nynorsk translations</change>
+        <change>Added unread count to new folder drawer</change>
+        <change>Improved first-time user experience for importing settings</change>
+        <change>Shortened headers to prevent wrapping</change>
+        <change>Correct saving of 'Bcc all messages' setting</change>
+        <change>Better QR code import instructions</change>
+    </release>    <release version="8.0b3" versioncode="6" date="2024-10-15">
         <change>Support Thunderbird with our new in-app financial contribution feature (work in progress)</change>
         <change>OAuth support now available for Fastmail</change>
         <change>Better guidance when using the import from app feature</change>
diff --git a/metadata b/metadata
index cd46587ebb6..c94b88fb8fa 120000
--- a/metadata
+++ b/metadata
@@ -1 +1 @@
-app-metadata/com.fsck.k9
\ No newline at end of file
+app-metadata/net.thunderbird.android.beta
\ No newline at end of file