mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 22:21:18 +00:00
Code Issues Releases Wiki Activity

Prevent crash

Browse source
This commit is contained in:
M66B 2018-10-28 07:27:22 +00:00
parent f602a6d687
commit 59ba5634ad
1 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
app/src/main/java/eu/faircode/email/ActivityCompose.java
View file

@ -58,31 +58,54 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
args.putLong("account", -1); args.putLong("account", -1);
Uri uri = intent.getData(); Uri uri = intent.getData();
if (uri != null && "mailto".equals(uri.getScheme())) if (uri != null && "mailto".equals(uri.getScheme())) {
args.putString("to", uri.getSchemeSpecificPart()); String to = uri.getSchemeSpecificPart();
if (to != null)
args.putString("to", to);
}
if (intent.hasExtra(Intent.EXTRA_EMAIL)) if (intent.hasExtra(Intent.EXTRA_EMAIL)) {
args.putString("to", TextUtils.join(", ", intent.getStringArrayExtra(Intent.EXTRA_EMAIL))); String[] to = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
if (to != null)
args.putString("to", TextUtils.join(", ", to));
}
if (intent.hasExtra(Intent.EXTRA_CC)) if (intent.hasExtra(Intent.EXTRA_CC)) {
args.putString("cc", TextUtils.join(", ", intent.getStringArrayExtra(Intent.EXTRA_CC))); String[] cc = intent.getStringArrayExtra(Intent.EXTRA_CC);
if (cc != null)
args.putString("cc", TextUtils.join(", ", cc));
}
if (intent.hasExtra(Intent.EXTRA_BCC)) if (intent.hasExtra(Intent.EXTRA_BCC)) {
args.putString("bcc", TextUtils.join(", ", intent.getStringArrayExtra(Intent.EXTRA_BCC))); String[] bcc = intent.getStringArrayExtra(Intent.EXTRA_BCC);
if (bcc != null)
args.putString("bcc", TextUtils.join(", ", bcc));
}
if (intent.hasExtra(Intent.EXTRA_SUBJECT)) if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
args.putString("subject", intent.getStringExtra(Intent.EXTRA_SUBJECT)); String subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
if (subject != null)
args.putString("subject", subject);
}
if (intent.hasExtra(Intent.EXTRA_TEXT)) if (intent.hasExtra(Intent.EXTRA_TEXT)) {
args.putString("body", intent.getStringExtra(Intent.EXTRA_TEXT)); // Intent.EXTRA_HTML_TEXT String body = intent.getStringExtra(Intent.EXTRA_TEXT); // Intent.EXTRA_HTML_TEXT
if (body != null)
args.putString("body", body);
}
if (intent.hasExtra(Intent.EXTRA_STREAM)) if (intent.hasExtra(Intent.EXTRA_STREAM))
if (Intent.ACTION_SEND_MULTIPLE.equals(action)) if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
args.putParcelableArrayList("attachments", intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM)); ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
else { if (uris != null)
ArrayList<Uri> uris = new ArrayList<>(); args.putParcelableArrayList("attachments", uris);
uris.add((Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM)); } else {
args.putParcelableArrayList("attachments", uris); Uri stream = intent.getParcelableExtra(Intent.EXTRA_STREAM);
if (stream != null) {
ArrayList<Uri> uris = new ArrayList<>();
uris.add((Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM));
args.putParcelableArrayList("attachments", uris);
}
} }
} else } else
args = intent.getExtras(); args = intent.getExtras();