From 562c6e51e6dfcb6486bda67840cfeae7d063f943 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 22 May 2024 09:22:59 +0200 Subject: [PATCH] Updated AndroidX fragment --- CHANGELOG.md | 2 +- app/build.gradle | 2 +- app/src/main/assets/CHANGELOG.md | 2 +- app/src/main/java/eu/faircode/email/ApplicationEx.java | 5 +++++ metadata/en-US/changelogs/2183.txt | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5511e7e524..57e3953a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Fixed black background of black and white theme * Using account color as default for inbox folder color * Small improvements and minor bug fixes +* Updated [AndroidX](https://developer.android.com/jetpack/androidx/versions/all-channel) * Updated [translations](https://crowdin.com/project/open-source-email) Preview versions are available [here](https://bitbucket.org/M66B/fairemail-test/downloads/). @@ -36,7 +37,6 @@ Preview versions are available [here](https://bitbucket.org/M66B/fairemail-test/ * Improved OpenAI integration (added multimodal support) * Improved Gemini integration * Made "AI" integrations available in the Play Store version -* Updated [AndroidX](https://developer.android.com/jetpack/androidx/versions/all-channel) * Small improvements and minor bug fixes * Updated [translations](https://crowdin.com/project/open-source-email) diff --git a/app/build.gradle b/app/build.gradle index ce26cbfafc..9803563276 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -549,7 +549,7 @@ dependencies { def emoji_version = "1.4.0" // 1.5.0-alpha01 def flatbuffers_version = "2.0.0" def activity_version = " 1.9.0" - def fragment_version = "1.6.2" // 1.7.1 // 1.8.0-beta01 + def fragment_version = "1.7.1" // 1.7.1 // 1.8.0-beta01 def windows_version = "1.2.0" // 1.3.0-rc01 def webkit_version = "1.10.0" // 1.11.0 def recyclerview_version = "1.3.2" // 1.4.0-alpha01 diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md index 5511e7e524..57e3953a0a 100644 --- a/app/src/main/assets/CHANGELOG.md +++ b/app/src/main/assets/CHANGELOG.md @@ -14,6 +14,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Fixed black background of black and white theme * Using account color as default for inbox folder color * Small improvements and minor bug fixes +* Updated [AndroidX](https://developer.android.com/jetpack/androidx/versions/all-channel) * Updated [translations](https://crowdin.com/project/open-source-email) Preview versions are available [here](https://bitbucket.org/M66B/fairemail-test/downloads/). @@ -36,7 +37,6 @@ Preview versions are available [here](https://bitbucket.org/M66B/fairemail-test/ * Improved OpenAI integration (added multimodal support) * Improved Gemini integration * Made "AI" integrations available in the Play Store version -* Updated [AndroidX](https://developer.android.com/jetpack/androidx/versions/all-channel) * Small improvements and minor bug fixes * Updated [translations](https://crowdin.com/project/open-source-email) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 11e5b5a0c5..4a3fc44551 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -46,6 +46,7 @@ import androidx.core.os.LocaleListCompat; import androidx.emoji2.text.DefaultEmojiCompatConfig; import androidx.emoji2.text.EmojiCompat; import androidx.emoji2.text.FontRequestEmojiCompatConfig; +import androidx.fragment.app.FragmentManager; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; @@ -254,6 +255,10 @@ public class ApplicationEx extends Application DB.setupViewInvalidation(this); + // https://issuetracker.google.com/issues/341313071 + // https://developer.android.com/guide/navigation/custom-back/predictive-back-gesture#opt-predictive + FragmentManager.enablePredictiveBack(false); + if (Helper.hasWebView(this)) CookieManager.getInstance().setAcceptCookie(false); diff --git a/metadata/en-US/changelogs/2183.txt b/metadata/en-US/changelogs/2183.txt index b6b28c427b..24c3be146b 100644 --- a/metadata/en-US/changelogs/2183.txt +++ b/metadata/en-US/changelogs/2183.txt @@ -14,6 +14,7 @@ Next version * Fixed black background of black and white theme * Using account color as default for inbox folder color * Small improvements and minor bug fixes +* Updated AndroidX * Updated translations Preview versions are available here. @@ -36,7 +37,6 @@ Preview versions are available here. * Improved OpenAI integration (added multimodal support) * Improved Gemini integration * Made "AI" integrations available in the Play Store version -* Updated AndroidX * Small improvements and minor bug fixes * Updated translations