From e8032df96057ffbec643b66ba973febcb375aa79 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 28 Aug 2018 14:59:52 +0000 Subject: [PATCH] Fixed crash, simplification --- .../main/java/eu/faircode/email/FragmentCompose.java | 6 +++--- .../main/java/eu/faircode/email/FragmentMessage.java | 10 +++++----- app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index ee397f4092..810791d0e4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -865,9 +865,9 @@ public class FragmentCompose extends FragmentEx { final String action = getArguments().getString("action"); Log.i(Helper.TAG, "Loaded draft id=" + draft.id + " action=" + action); - etTo.setText(draft.to == null ? null : MessageHelper.getFormattedAddresses(draft.to, true)); - etCc.setText(draft.cc == null ? null : MessageHelper.getFormattedAddresses(draft.cc, true)); - etBcc.setText(draft.bcc == null ? null : MessageHelper.getFormattedAddresses(draft.bcc, true)); + etTo.setText(MessageHelper.getFormattedAddresses(draft.to, true)); + etCc.setText(MessageHelper.getFormattedAddresses(draft.cc, true)); + etBcc.setText(MessageHelper.getFormattedAddresses(draft.bcc, true)); etSubject.setText(draft.subject); etBody.setText(null); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index 8af6ec9549..a1448f5f2b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessage.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java @@ -375,16 +375,16 @@ public class FragmentMessage extends FragmentEx { if (savedInstanceState == null) { setSubtitle(Helper.localizeFolderName(getContext(), message.folderName)); - tvFrom.setText(message.from == null ? null : MessageHelper.getFormattedAddresses(message.from, true)); + tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, true)); tvTime.setText(message.sent == null ? null : df.format(new Date(message.sent))); - tvTo.setText(message.to == null ? null : MessageHelper.getFormattedAddresses(message.to, true)); + tvTo.setText(MessageHelper.getFormattedAddresses(message.to, true)); tvSubject.setText(message.subject); tvCount.setText(Integer.toString(message.count)); - tvReplyTo.setText(message.reply == null ? null : MessageHelper.getFormattedAddresses(message.reply, true)); - tvCc.setText(message.cc == null ? null : MessageHelper.getFormattedAddresses(message.cc, true)); - tvBcc.setText(message.bcc == null ? null : MessageHelper.getFormattedAddresses(message.bcc, true)); + tvReplyTo.setText(MessageHelper.getFormattedAddresses(message.reply, true)); + tvCc.setText(MessageHelper.getFormattedAddresses(message.cc, true)); + tvBcc.setText(MessageHelper.getFormattedAddresses(message.bcc, true)); tvError.setText(message.error); } else { diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 2f2896e14e..eee3d736a8 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -252,8 +252,8 @@ public class MessageHelper { } static String getFormattedAddresses(Address[] addresses, boolean full) { - if (addresses == null) - return null; + if (addresses == null || addresses.length == 0) + return ""; List formatted = new ArrayList<>(); for (Address address : addresses)