From 02d0e1b28cf8e259af2866f0be3e4e56770deefe Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 6 Oct 2021 07:48:03 +0200 Subject: [PATCH] Allow selecting no send font --- .../faircode/email/FragmentOptionsSend.java | 5 +++-- .../java/eu/faircode/email/MessageHelper.java | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index f291026196..d02ddba485 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -158,6 +158,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc String[] fontNameValues = getResources().getStringArray(R.array.fontNameValues); List fn = new ArrayList<>(); + fn.add("-"); for (int i = 0; i < fontNameNames.length; i++) { SpannableStringBuilder ssb = new SpannableStringBuilderEx(fontNameNames[i]); ssb.setSpan(new TypefaceSpan(fontNameValues[i]), 0, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -291,7 +292,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc spComposeFont.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView adapterView, View view, int position, long id) { - String value = fontNameValues[position]; + String value = (position == 0 ? "" : fontNameValues[position - 1]); boolean monospaced = prefs.getBoolean("monospaced", false); if (value.equals(monospaced ? "monospace" : "sans-serif")) prefs.edit().remove("compose_font").apply(); @@ -555,7 +556,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc String[] fontNameValues = getResources().getStringArray(R.array.fontNameValues); for (int pos = 0; pos < fontNameValues.length; pos++) if (fontNameValues[pos].equals(compose_font)) { - spComposeFont.setSelection(pos); + spComposeFont.setSelection(pos + 1); break; } diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 89ab38707e..dbbbf412c9 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -704,15 +704,16 @@ public class MessageHelper { if (auto_link) HtmlHelper.autoLink(document); - for (Element child : document.body().children()) - if (!TextUtils.isEmpty(child.text()) && - TextUtils.isEmpty(child.attr("fairemail"))) { - String old = child.attr("style"); - String style = HtmlHelper.mergeStyles( - "font-family:" + compose_font, old); - if (!old.equals(style)) - child.attr("style", style); - } + if (!TextUtils.isEmpty(compose_font)) + for (Element child : document.body().children()) + if (!TextUtils.isEmpty(child.text()) && + TextUtils.isEmpty(child.attr("fairemail"))) { + String old = child.attr("style"); + String style = HtmlHelper.mergeStyles( + "font-family:" + compose_font, old); + if (!old.equals(style)) + child.attr("style", style); + } document.select("div[fairemail=signature]").removeAttr("fairemail"); document.select("div[fairemail=reference]").removeAttr("fairemail");