From 6bf88d29f01b11d0ef3a5da1902c44075bcfc502 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 18 Feb 2024 23:15:40 +0100 Subject: [PATCH] Removed Markdown There are no maintained libraries to reliably convert HTML to Markdown --- ATTRIBUTION.md | 1 - CHANGELOG.md | 1 - FAQ.md | 6 ------ app/build.gradle | 4 ++-- app/src/main/assets/ATTRIBUTION.md | 1 - app/src/main/assets/CHANGELOG.md | 1 - .../java/eu/faircode/email/FragmentCompose.java | 16 +++++++--------- index.html | 3 --- metadata/en-US/changelogs/2159.txt | 1 - 9 files changed, 9 insertions(+), 25 deletions(-) diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index bd537e5e94..d12820378f 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -55,4 +55,3 @@ FairEmail uses parts or all of: * [AG Filters Registry](https://github.com/AdguardTeam/FiltersRegistry). [GNU Lesser General Public License Version 3](https://github.com/AdguardTeam/FiltersRegistry/blob/master/LICENSE). * [Certificate transparency for Android and JVM](https://github.com/appmattus/certificatetransparency). Copyright 2023 Appmattus Limited. [Apache License 2.0](https://github.com/appmattus/certificatetransparency/blob/main/LICENSE.md). * [ZXing](https://github.com/zxing/zxing). Copyright (C) 2014 ZXing authors. [Apache License 2.0](https://github.com/zxing/zxing/blob/master/LICENSE). -* [https://github.com/vsch/flexmark-java](flexmark-java). Copyright (c) 2015-2016, Atlassian Pty Ltd. Copyright (c) 2016-2018, Vladimir Schneider. [BSD-2-Clause license](https://github.com/vsch/flexmark-java/blob/master/LICENSE.txt). diff --git a/CHANGELOG.md b/CHANGELOG.md index fe0548e562..c9070fb007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Added importing of mbox files into POP3 folders * Added long press links to open confirmation dialog box * Added long press archive / bottom action bar to move conversations -* Added experimental markdown support to the message editor * Small improvements and minor bug fixes * Updated [translations](https://crowdin.com/project/open-source-email) diff --git a/FAQ.md b/FAQ.md index 1c60a77d5b..fddafc89ed 100644 --- a/FAQ.md +++ b/FAQ.md @@ -4025,12 +4025,6 @@ The subject of a received message can be edited, also on the email server, via t
-*Markdown (1.2160+)* - -The message editor can be switched to markdown mode via the three-dots overflow menu. - -
- **(126) Can message previews be sent to my smartwatch?** diff --git a/app/build.gradle b/app/build.gradle index af52775720..0be1c904e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -775,8 +775,8 @@ dependencies { // https://github.com/vsch/flexmark-java // https://mvnrepository.com/artifact/com.vladsch.flexmark/flexmark //implementation "com.vladsch.flexmark:flexmark:$flexmark_version" - implementation "com.vladsch.flexmark:flexmark-ext-tables:$flexmark_version" - implementation "com.vladsch.flexmark:flexmark-html2md-converter:$flexmark_version" + //implementation "com.vladsch.flexmark:flexmark-ext-tables:$flexmark_version" + //implementation "com.vladsch.flexmark:flexmark-html2md-converter:$flexmark_version" // // https://github.com/QuadFlask/colorpicker //implementation "com.github.QuadFlask:colorpicker:$colorpicker_version" diff --git a/app/src/main/assets/ATTRIBUTION.md b/app/src/main/assets/ATTRIBUTION.md index bd537e5e94..d12820378f 100644 --- a/app/src/main/assets/ATTRIBUTION.md +++ b/app/src/main/assets/ATTRIBUTION.md @@ -55,4 +55,3 @@ FairEmail uses parts or all of: * [AG Filters Registry](https://github.com/AdguardTeam/FiltersRegistry). [GNU Lesser General Public License Version 3](https://github.com/AdguardTeam/FiltersRegistry/blob/master/LICENSE). * [Certificate transparency for Android and JVM](https://github.com/appmattus/certificatetransparency). Copyright 2023 Appmattus Limited. [Apache License 2.0](https://github.com/appmattus/certificatetransparency/blob/main/LICENSE.md). * [ZXing](https://github.com/zxing/zxing). Copyright (C) 2014 ZXing authors. [Apache License 2.0](https://github.com/zxing/zxing/blob/master/LICENSE). -* [https://github.com/vsch/flexmark-java](flexmark-java). Copyright (c) 2015-2016, Atlassian Pty Ltd. Copyright (c) 2016-2018, Vladimir Schneider. [BSD-2-Clause license](https://github.com/vsch/flexmark-java/blob/master/LICENSE.txt). diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md index fe0548e562..c9070fb007 100644 --- a/app/src/main/assets/CHANGELOG.md +++ b/app/src/main/assets/CHANGELOG.md @@ -13,7 +13,6 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Added importing of mbox files into POP3 folders * Added long press links to open confirmation dialog box * Added long press archive / bottom action bar to move conversations -* Added experimental markdown support to the message editor * 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/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index cf8bd9d2d5..8f96619871 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -136,12 +136,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.LabelVisibilityMode; import com.google.android.material.snackbar.Snackbar; -import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension; -import com.vladsch.flexmark.ext.tables.TablesExtension; -import com.vladsch.flexmark.html.HtmlRenderer; -import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter; -import com.vladsch.flexmark.parser.Parser; -import com.vladsch.flexmark.util.data.MutableDataSet; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.cert.jcajce.JcaCertStore; @@ -2027,7 +2021,7 @@ public class FragmentCompose extends FragmentBase { menu.findItem(R.id.menu_media).setChecked(media); menu.findItem(R.id.menu_compact).setChecked(compact); menu.findItem(R.id.menu_markdown).setChecked(markdown); - menu.findItem(R.id.menu_markdown).setVisible(experiments); + menu.findItem(R.id.menu_markdown).setVisible(false && experiments); View image = media_bar.findViewById(R.id.menu_image); if (image != null) @@ -6719,7 +6713,8 @@ public class FragmentCompose extends FragmentBase { boolean dirty = false; String body; - if (markdown ^ extras.getBoolean("markdown")) { + if (false && (markdown ^ extras.getBoolean("markdown"))) { +/* MutableDataSet options = new MutableDataSet(); options.set(Parser.EXTENSIONS, Arrays.asList( TablesExtension.create(), @@ -6736,6 +6731,7 @@ public class FragmentCompose extends FragmentBase { if (markdown != extras.getBoolean("markdown")) dirty = true; + */ } else body = HtmlHelper.toHtml(spanned, context); @@ -7699,13 +7695,15 @@ public class FragmentCompose extends FragmentBase { ref.remove(); Spanned spannedBody; - if (markdown) { + if (false && markdown) { +/* MutableDataSet options = new MutableDataSet(); // HtmlConverterCoreNodeRenderer // options.set(FlexmarkHtmlConverter.LISTS_END_ON_DOUBLE_BLANK, false); String text = FlexmarkHtmlConverter.builder(options).build().convert(doc.html()); text = text.replaceAll("\n.*\n\n", ""); spannedBody = new SpannableStringBuilder(text); + */ } else { HtmlHelper.clearAnnotations(doc); // Legacy left-overs diff --git a/index.html b/index.html index 6639ed1675..06ab276295 100644 --- a/index.html +++ b/index.html @@ -2057,9 +2057,6 @@ $NotDisplayed

Edit subject (1.2046+)

The subject of a received message can be edited, also on the email server, via the horizontal three-dots button just above the message text near the left side of the screen.


-

Markdown (1.2160+)

-

The message editor can be switched to markdown mode via the three-dots overflow menu.

-


(126) Can message previews be sent to my smartwatch?

🌎 Google Translate

FairEmail fetches a message in two steps:

diff --git a/metadata/en-US/changelogs/2159.txt b/metadata/en-US/changelogs/2159.txt index d87f25f27e..43cb28034f 100644 --- a/metadata/en-US/changelogs/2159.txt +++ b/metadata/en-US/changelogs/2159.txt @@ -13,7 +13,6 @@ Next version * Added importing of mbox files into POP3 folders * Added long press links to open confirmation dialog box * Added long press archive / bottom action bar to move conversations -* Added experimental markdown support to the message editor * Small improvements and minor bug fixes * Updated translations