Simplification

pull/194/merge
M66B 4 years ago
parent 186c79a846
commit c1b4c0d19d

@ -4923,7 +4923,6 @@ public class FragmentCompose extends FragmentBase {
"forward".equals(action) || "forward".equals(action) ||
"resend".equals(action) || "resend".equals(action) ||
"editasnew".equals(action))) { "editasnew".equals(action))) {
List<String> cid = new ArrayList<>(); List<String> cid = new ArrayList<>();
for (Element img : document.select("img")) { for (Element img : document.select("img")) {
String src = img.attr("src"); String src = img.attr("src");
@ -4936,9 +4935,7 @@ public class FragmentCompose extends FragmentBase {
for (EntityAttachment attachment : attachments) for (EntityAttachment attachment : attachments)
if (!attachment.isEncryption() && if (!attachment.isEncryption() &&
(cid.contains(attachment.cid) || (cid.contains(attachment.cid) ||
"forward".equals(action) || !("reply".equals(action) || "reply_all".equals(action)))) {
"resend".equals(action) ||
"editasnew".equals(action))) {
if (attachment.available) { if (attachment.available) {
File source = attachment.getFile(context); File source = attachment.getFile(context);
@ -4958,9 +4955,7 @@ public class FragmentCompose extends FragmentBase {
Helper.copy(source, target); Helper.copy(source, target);
if (resize_reply && if (resize_reply &&
!("forward".equals(action) || ("reply".equals(action) || "reply_all".equals(action)))
"resend".equals(action) ||
"editasnew".equals(action)))
resizeAttachment(context, attachment, REDUCED_IMAGE_SIZE); resizeAttachment(context, attachment, REDUCED_IMAGE_SIZE);
} else } else
args.putBoolean("incomplete", true); args.putBoolean("incomplete", true);

Loading…
Cancel
Save