Merge branch 'origin-main-to-upstream-6.712-#4-from-89f59b0b-to-a75c7abb' into... (422b759c) · Commits · e / os / Mail

.github/ISSUE_TEMPLATE/bug_report.yml

+1 −1

Original line number	Diff line number	Diff line
		name: Bug report
		description: Let us know about crashes or existing functionality not working like it should.
		labels: [ "bug" ]
		labels: [ "bug", "unconfirmed" ]
		body:
		- type: markdown
		attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

+1 −1

Original line number	Diff line number	Diff line
		name: Feature request
		description: Suggest an idea for K-9 Mail
		labels: [ "enhancement" ]
		labels: [ "enhancement", "unconfirmed" ]
		body:
		- type: checkboxes
		id: checklist

app/core/src/main/java/com/fsck/k9/K9.kt

+14 −9

Original line number	Diff line number	Diff line
		@@ -198,11 +198,7 @@ object K9 : EarlyInit {
		@JvmStatic
		var isUseMessageViewFixedWidthFont = false

		@JvmStatic
		var isMessageViewReturnToList = false

		@JvmStatic
		var isMessageViewShowNext = false
		var messageViewPostRemoveNavigation: PostRemoveNavigation = PostRemoveNavigation.ReturnToMessageList

		@JvmStatic
		var isUseVolumeKeysForNavigation = false
		@@ -351,8 +347,8 @@ object K9 : EarlyInit {
		isChangeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false)
		contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt())
		isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)
		isMessageViewReturnToList = storage.getBoolean("messageViewReturnToList", false)
		isMessageViewShowNext = storage.getBoolean("messageViewShowNext", false)
		messageViewPostRemoveNavigation =
		storage.getEnum("messageViewPostDeleteAction", PostRemoveNavigation.ReturnToMessageList)
		isHideUserAgent = storage.getBoolean("hideUserAgent", false)
		isHideTimeZone = storage.getBoolean("hideTimeZone", false)

		@@ -432,8 +428,7 @@ object K9 : EarlyInit {
		editor.putBoolean("changeRegisteredNameColor", isChangeContactNameColor)
		editor.putInt("registeredNameColor", contactNameColor)
		editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont)
		editor.putBoolean("messageViewReturnToList", isMessageViewReturnToList)
		editor.putBoolean("messageViewShowNext", isMessageViewShowNext)
		editor.putEnum("messageViewPostDeleteAction", messageViewPostRemoveNavigation)
		editor.putBoolean("hideUserAgent", isHideUserAgent)
		editor.putBoolean("hideTimeZone", isHideTimeZone)

		@@ -586,4 +581,14 @@ object K9 : EarlyInit {
		Share.EXTRA_FROM = "$packageName.intent.extra.SENDER"
		}
		}

		/**
		* The navigation actions that can be to performed after the user has deleted or moved a message from the message
		* view screen.
		*/
		enum class PostRemoveNavigation {
		ReturnToMessageList,
		ShowPreviousMessage,
		ShowNextMessage,
		}
		}

app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ import com.fsck.k9.FontSizes;
		import com.fsck.k9.K9;
		import com.fsck.k9.K9.BACKGROUND_OPS;
		import com.fsck.k9.K9.NotificationQuickDelete;
		import com.fsck.k9.K9.PostRemoveNavigation;
		import com.fsck.k9.K9.SplitViewMode;
		import com.fsck.k9.SwipeAction;
		import com.fsck.k9.UiDensity;
		@@ -37,6 +38,7 @@ import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo31;
		import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo58;
		import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo69;
		import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo79;
		import com.fsck.k9.preferences.upgrader.GeneralSettingsUpgraderTo89;

		import static com.fsck.k9.K9.LockScreenNotificationVisibility;

		@@ -138,10 +140,12 @@ public class GeneralSettingsDescriptions {
		new V(1, new BooleanSetting(false))
		));
		s.put("messageViewReturnToList", Settings.versions(
		new V(1, new BooleanSetting(false))
		new V(1, new BooleanSetting(false)),
		new V(89, null)
		));
		s.put("messageViewShowNext", Settings.versions(
		new V(1, new BooleanSetting(false))
		new V(1, new BooleanSetting(false)),
		new V(89, null)
		));
		s.put("quietTimeEnabled", Settings.versions(
		new V(1, new BooleanSetting(false))
		@@ -289,6 +293,9 @@ public class GeneralSettingsDescriptions {
		s.put("fontSizeMessageViewAccountName", Settings.versions(
		new V(87, new FontSizeSetting(FontSizes.FONT_DEFAULT))
		));
		s.put("messageViewPostDeleteAction", Settings.versions(
		new V(89, new EnumSetting<>(PostRemoveNavigation.class, PostRemoveNavigation.ReturnToMessageList))
		));

		SETTINGS = Collections.unmodifiableMap(s);

		@@ -298,6 +305,7 @@ public class GeneralSettingsDescriptions {
		u.put(58, new GeneralSettingsUpgraderTo58());
		u.put(69, new GeneralSettingsUpgraderTo69());
		u.put(79, new GeneralSettingsUpgraderTo79());
		u.put(89, new GeneralSettingsUpgraderTo89());

		UPGRADERS = Collections.unmodifiableMap(u);
		}

app/core/src/main/java/com/fsck/k9/preferences/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public class Settings {
		*
		* @see SettingsExporter
		*/
		public static final int VERSION = 88;
		public static final int VERSION = 89;

		static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
		Map<String, String> importedSettings, boolean useDefaultValues) {