From 3917f0401e68b047a5d2b0a4e029c21731702c0d Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 9 Jan 2019 07:30:46 +0000 Subject: [PATCH] Fixed empty signatures --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 8 ++++---- app/src/main/java/eu/faircode/email/FragmentIdentity.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 15f02dc180..21d8ab5a2a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -223,9 +223,9 @@ public class FragmentCompose extends FragmentEx { int at = (identity == null ? -1 : identity.email.indexOf('@')); tvExtraPrefix.setText(at < 0 ? null : identity.email.substring(0, at)); tvExtraSuffix.setText(at < 0 ? null : identity.email.substring(at)); + Spanned signature = null; if (pro) { - Spanned signature = null; - if (identity != null && identity.signature != null) + if (identity != null && !TextUtils.isEmpty(identity.signature)) signature = Html.fromHtml(identity.signature, new Html.ImageGetter() { @Override public Drawable getDrawable(String source) { @@ -236,9 +236,9 @@ public class FragmentCompose extends FragmentEx { return d; } }, null); - tvSignature.setText(signature); - grpSignature.setVisibility(signature == null ? View.GONE : View.VISIBLE); } + tvSignature.setText(signature); + grpSignature.setVisibility(signature == null ? View.GONE : View.VISIBLE); } @Override diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index f8377a47aa..6c133332cb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -704,7 +704,8 @@ public class FragmentIdentity extends FragmentEx { etEmail.setText(identity == null ? null : identity.email); etDisplay.setText(identity == null ? null : identity.display); - etSignature.setText(identity == null || identity.signature == null ? null : Html.fromHtml(identity.signature)); + etSignature.setText(identity == null || + TextUtils.isEmpty(identity.signature) ? null : Html.fromHtml(identity.signature)); etHost.setText(identity == null ? null : identity.host); cbStartTls.setChecked(identity == null ? false : identity.starttls);