Merge branch '6.6-MAINT' into 'main'

app/k9mail/build.gradle.kts

@@ -45,7 +45,7 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 36000
+        versionCode = 36001
         versionName = "6.700-SNAPSHOT"
 
         // Keep in sync with the resource string array "supported_languages"

app/k9mail/src/main/res/values-v31/manifest_values.xml

@@ -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>

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>

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>

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+