Merge branch '6.6-MAINT'

app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt

@@ -20,7 +20,7 @@ class ReplyActionStrategy(private val replyRoParser: ReplyToParser) {
                 ReplyActions(defaultAction = ReplyAction.REPLY)
             }
         } else {
-            ReplyActions(defaultAction = ReplyAction.REPLY_ALL, additionalActions = listOf(ReplyAction.REPLY))
+            ReplyActions(defaultAction = ReplyAction.REPLY, additionalActions = listOf(ReplyAction.REPLY_ALL))
         }
     }
 }

app/core/src/test/java/com/fsck/k9/message/ReplyActionStrategyTest.kt

@@ -39,8 +39,8 @@ class ReplyActionStrategyTest {
 
         val replyActions = replyActionStrategy.getReplyActions(account, message)
 
-        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY_ALL)
-        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY)
+        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY)
+        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY_ALL)
     }
 
     @Test
@@ -52,8 +52,8 @@ class ReplyActionStrategyTest {
 
         val replyActions = replyActionStrategy.getReplyActions(account, message)
 
-        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY_ALL)
-        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY)
+        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY)
+        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY_ALL)
     }
 
     @Test
@@ -66,8 +66,8 @@ class ReplyActionStrategyTest {
 
         val replyActions = replyActionStrategy.getReplyActions(account, message)
 
-        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY_ALL)
-        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY)
+        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY)
+        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY_ALL)
     }
 
     @Test
@@ -80,8 +80,8 @@ class ReplyActionStrategyTest {
 
         val replyActions = replyActionStrategy.getReplyActions(account, message)
 
-        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY_ALL)
-        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY)
+        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY)
+        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY_ALL)
     }
 
     @Test
@@ -93,8 +93,8 @@ class ReplyActionStrategyTest {
 
         val replyActions = replyActionStrategy.getReplyActions(account, message)
 
-        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY_ALL)
-        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY)
+        assertThat(replyActions.defaultAction).isEqualTo(ReplyAction.REPLY)
+        assertThat(replyActions.additionalActions).containsExactly(ReplyAction.REPLY_ALL)
     }
 
     @Test

app/ui/legacy/src/main/res/raw/changelog_master.xml

@@ -24,6 +24,9 @@
         <change>Fixed various crashes</change>
         <change>Updated translations</change>
     </release>
+    <release version="6.602" versioncode="36002" date="2023-05-11">
+        <change>Change primary action in message view header from "reply all" to "reply"</change>
+    </release>
     <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>

fastlane/metadata/android/en-US/changelogs/36002.txt

@@ -0,0 +1 @@
+- Change primary action in message view header from "reply all" to "reply"