diff --git a/CHANGELOG.md b/CHANGELOG.md index d75e120d08..1f37fb3d94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -295,6 +295,8 @@ Preview versions are available [here](https://bitbucket.org/M66B/fairemail-test/ * Updated libraries (Apache Compress, Bugsnag, Bouncy Castle, Jsoup) * Updated [translations](https://crowdin.com/project/open-source-email) + + ### 1.2145 - 2023-12-30 * Added Adguard filter list to remove tracking parameters from links, see [the FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#faq200) diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md index d75e120d08..1f37fb3d94 100644 --- a/app/src/main/assets/CHANGELOG.md +++ b/app/src/main/assets/CHANGELOG.md @@ -295,6 +295,8 @@ Preview versions are available [here](https://bitbucket.org/M66B/fairemail-test/ * Updated libraries (Apache Compress, Bugsnag, Bouncy Castle, Jsoup) * Updated [translations](https://crowdin.com/project/open-source-email) + + ### 1.2145 - 2023-12-30 * Added Adguard filter list to remove tracking parameters from links, see [the FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#faq200) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java index 262b0e00c5..9e0c039d10 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java @@ -88,6 +88,12 @@ public class FragmentDialogMarkdown extends FragmentDialogBase { markdown = Helper.readStream(is); } + if ("CHANGELOG.md".equals(name)) { + int pos = markdown.indexOf(""); + if (pos > 0) + markdown = markdown.substring(0, pos); + } + markdown = markdown .replace("/FAQ.md#FAQ", "/FAQ.md#faq") .replace("/FAQ.md#user-content-faq", "/FAQ.md#faq") diff --git a/metadata/en-US/changelogs/2182.txt b/metadata/en-US/changelogs/2182.txt index 8000bd99c2..cd8d1632cf 100644 --- a/metadata/en-US/changelogs/2182.txt +++ b/metadata/en-US/changelogs/2182.txt @@ -295,6 +295,8 @@ Wintonotitan * Updated libraries (Apache Compress, Bugsnag, Bouncy Castle, Jsoup) * Updated translations + + 1.2145 - 2023-12-30 * Added Adguard filter list to remove tracking parameters from links, see the FAQ