Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 19:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed empty signatures

Browse Source
This commit is contained in:
M66B
2019-01-09 07:30:46 +00:00
parent b500ea1995
commit 3917f0401e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -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

3
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@@ -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);