msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added In-reply-to multi address support

Browse Source
pull/208/head
M66B 2 years ago
parent 29b36948f7
commit c9ff506dab
5 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File

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

@ -5944,8 +5944,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return null; return null;
if (!TextUtils.isEmpty(message.inreplyto)) if (!TextUtils.isEmpty(message.inreplyto))
for (EntityMessage m : db.message().getMessagesByMsgId(message.account, message.inreplyto)) for (String inreplyto : message.inreplyto.split(" "))
map.put(m.msgid, m); for (EntityMessage m : db.message().getMessagesByMsgId(message.account, inreplyto))
map.put(m.msgid, m);
if (!TextUtils.isEmpty(message.references)) if (!TextUtils.isEmpty(message.references))
for (String ref : message.references.split(" ")) for (String ref : message.references.split(" "))
@ -5970,7 +5971,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
start = ssb.length(); start = ssb.length();
ssb.append("In-reply-to: "); ssb.append("In-reply-to: ");
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0); ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0);
ssb.append(message.inreplyto).append("\n"); for (String inreplyto : message.inreplyto.split(" "))
ssb.append(inreplyto).append("\n");
} }
if (!TextUtils.isEmpty(message.references)) { if (!TextUtils.isEmpty(message.references)) {

14
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -4242,11 +4242,12 @@ class Core {
List<EntityMessage> all = new ArrayList<>(); List<EntityMessage> all = new ArrayList<>();
if (message.inreplyto != null) { if (message.inreplyto != null)
List<EntityMessage> replied = db.message().getMessagesByMsgId(folder.account, message.inreplyto); for (String inreplyto : message.inreplyto.split(" ")) {
if (replied != null) List<EntityMessage> replied = db.message().getMessagesByMsgId(folder.account, inreplyto);
all.addAll(replied); if (replied != null)
} all.addAll(replied);
}
if (r.refid != null) { if (r.refid != null) {
List<EntityMessage> refs = db.message().getMessagesByMsgId(folder.account, r.refid); List<EntityMessage> refs = db.message().getMessagesByMsgId(folder.account, r.refid);
if (refs != null) if (refs != null)
@ -4261,7 +4262,8 @@ class Core {
} }
for (EntityFolder f : map.values()) for (EntityFolder f : map.values())
EntityOperation.queue(context, f, EntityOperation.REPORT, message.inreplyto, label); for (String inreplyto : message.inreplyto.split(" "))
EntityOperation.queue(context, f, EntityOperation.REPORT, inreplyto, label);
} }
} }
} catch (Throwable ex) { } catch (Throwable ex) {

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

@ -6464,12 +6464,13 @@ public class FragmentCompose extends FragmentBase {
if (extras.getBoolean("archive")) { if (extras.getBoolean("archive")) {
EntityFolder archive = db.folder().getFolderByType(draft.account, EntityFolder.ARCHIVE); EntityFolder archive = db.folder().getFolderByType(draft.account, EntityFolder.ARCHIVE);
if (archive != null) { if (archive != null)
List<EntityMessage> messages = db.message().getMessagesByMsgId(draft.account, draft.inreplyto); for (String inreplyto : draft.inreplyto.split(" ")) {
if (messages != null) List<EntityMessage> messages = db.message().getMessagesByMsgId(draft.account, inreplyto);
for (EntityMessage message : messages) if (messages != null)
EntityOperation.queue(context, message, EntityOperation.MOVE, archive.id); for (EntityMessage message : messages)
} EntityOperation.queue(context, message, EntityOperation.MOVE, archive.id);
}
} }
} }
} }
@ -7954,18 +7955,15 @@ public class FragmentCompose extends FragmentBase {
return false; return false;
} }
List<EntityMessage> messages = db.message().getMessagesByMsgId(draft.account, draft.inreplyto); for (String inreplyto : draft.inreplyto.split(" ")) {
if (messages == null || messages.size() == 0) { List<EntityMessage> messages = db.message().getMessagesByMsgId(draft.account, inreplyto);
args.putString("reason", "In-reply-to gone"); for (EntityMessage message : messages) {
return false; EntityFolder folder = db.folder().getFolder(message.folder);
} if (folder == null)
continue;
for (EntityMessage message : messages) { if (EntityFolder.INBOX.equals(folder.type) || EntityFolder.USER.equals(folder.type))
EntityFolder folder = db.folder().getFolder(message.folder); return true;
if (folder == null) }
continue;
if (EntityFolder.INBOX.equals(folder.type) || EntityFolder.USER.equals(folder.type))
return true;
} }
args.putString("reason", "Not in inbox or unread"); args.putString("reason", "Not in inbox or unread");

2
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -1314,7 +1314,7 @@ public class MessageHelper {
String getInReplyTo() throws MessagingException { String getInReplyTo() throws MessagingException {
String[] a = getInReplyTos(); String[] a = getInReplyTos();
return (a.length < 1 ? null : a[0]); return (a.length == 0 ? null : TextUtils.join(" ", a));
} }
String[] getInReplyTos() throws MessagingException { String[] getInReplyTos() throws MessagingException {

42
app/src/main/java/eu/faircode/email/ServiceSend.java
Unescape View File

@ -566,21 +566,24 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
Long sid = null; Long sid = null;
EntityFolder sent = null; EntityFolder sent = null;
if (reply_move && !TextUtils.isEmpty(message.inreplyto)) { if (reply_move && !TextUtils.isEmpty(message.inreplyto))
List<EntityMessage> replied = db.message().getMessagesByMsgId(message.account, message.inreplyto); for (String inreplyto : message.inreplyto.split(" ")) {
if (replied != null) List<EntityMessage> replied = db.message().getMessagesByMsgId(message.account, inreplyto);
for (EntityMessage m : replied) if (replied != null)
if (!m.ui_hide) { for (EntityMessage m : replied)
EntityFolder folder = db.folder().getFolder(m.folder); if (!m.ui_hide) {
if (folder != null && EntityFolder folder = db.folder().getFolder(m.folder);
(EntityFolder.INBOX.equals(folder.type) || if (folder != null &&
EntityFolder.ARCHIVE.equals(folder.type) || (EntityFolder.INBOX.equals(folder.type) ||
EntityFolder.USER.equals(folder.type))) { EntityFolder.ARCHIVE.equals(folder.type) ||
sent = folder; EntityFolder.USER.equals(folder.type))) {
break; sent = folder;
break;
}
} }
} if (sent != null)
} break;
}
if (sent == null) if (sent == null)
sent = db.folder().getFolderByType(message.account, EntityFolder.SENT); sent = db.folder().getFolderByType(message.account, EntityFolder.SENT);
@ -804,11 +807,12 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
} }
// Mark replied // Mark replied
if (message.inreplyto != null) { if (message.inreplyto != null)
List<EntityMessage> replieds = db.message().getMessagesByMsgId(message.account, message.inreplyto); for (String inreplyto : message.inreplyto.split(" ")) {
for (EntityMessage replied : replieds) List<EntityMessage> replieds = db.message().getMessagesByMsgId(message.account, inreplyto);
EntityOperation.queue(this, replied, EntityOperation.ANSWERED, true); for (EntityMessage replied : replieds)
} EntityOperation.queue(this, replied, EntityOperation.ANSWERED, true);
}
// Mark forwarded // Mark forwarded
if (message.wasforwardedfrom != null) { if (message.wasforwardedfrom != null) {

Write Preview
Loading…
Cancel
Save