From 692b03a5507451061a8fd07e873dac41f36a236a Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Mon, 17 Apr 2023 15:09:07 +0200
Subject: [PATCH 1/2] Enable home screen widgets by default

---
 app/k9mail/src/main/res/values-v31/manifest_values.xml | 5 -----
 app/k9mail/src/main/res/values/manifest_values.xml     | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 app/k9mail/src/main/res/values-v31/manifest_values.xml

diff --git a/app/k9mail/src/main/res/values-v31/manifest_values.xml b/app/k9mail/src/main/res/values-v31/manifest_values.xml
deleted file mode 100644
index f12344e77..000000000
--- a/app/k9mail/src/main/res/values-v31/manifest_values.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Home screen widgets should be disabled by default. They will be enabled programmatically if necessary. -->
-    <bool name="home_screen_widgets_enabled">false</bool>
-</resources>
diff --git a/app/k9mail/src/main/res/values/manifest_values.xml b/app/k9mail/src/main/res/values/manifest_values.xml
index 034aae205..dbd47485c 100644
--- a/app/k9mail/src/main/res/values/manifest_values.xml
+++ b/app/k9mail/src/main/res/values/manifest_values.xml
@@ -4,6 +4,10 @@
     We'd like to disable this component by default. However, due to a bug in Android versions prior to 12, users then
     wouldn't be able to use the home screen widget.
     See https://android.googlesource.com/platform/frameworks/base/+/85be035336af8d83eb24980026418207c85991cb%5E%21/#F0
+
+    Previously, we've set this value to false on Android 12+ devices. However, a few people have reported widgets
+    disappearing after updating to an app version containing that change. So for now we're back to having widgets
+    enabled by default on all Android versions. We'll try again for Android versions released in or after 2025.
     -->
     <bool name="home_screen_widgets_enabled">true</bool>
 </resources>

From af28c757dd9eb45e32c685e934ded2ee58bd21d3 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Tue, 18 Apr 2023 12:14:01 +0200
Subject: [PATCH 2/2] Version 6.601

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

diff --git a/app/k9mail/build.gradle.kts b/app/k9mail/build.gradle.kts
index 3df6d6c24..b5d7e14a8 100644
--- a/app/k9mail/build.gradle.kts
+++ b/app/k9mail/build.gradle.kts
@@ -45,8 +45,8 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 36000
-        versionName = "6.600"
+        versionCode = 36001
+        versionName = "6.601"
 
         // 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 e8dd923c7..b4f83d3ae 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,9 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.601" versioncode="36001" date="2023-04-18">
+        <change>Reverted changes to home screen widgets because apparently not every device vendor has incorporated the relevant fixes in Android 12+</change>
+    </release>
     <release version="6.600" versioncode="36000" date="2023-04-11">
         <change>Redesigned the message view screen; tap the message header containing sender/recipient names to see more details</change>
         <change>Added a setting for three different message list densities: compact, default, relaxed</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/36001.txt b/fastlane/metadata/android/en-US/changelogs/36001.txt
new file mode 100644
index 000000000..b22136cb6
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/36001.txt
@@ -0,0 +1 @@
+- Reverted changes to home screen widgets because apparently not every device vendor has incorporated the relevant fixes in Android 12+