From 9800d018b909b90d41af6ccd0ae304727e9dd9fd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 29 Mar 2021 15:04:27 +0200
Subject: [PATCH] Attempt to find right attendee on replying to invite

Closes #196
---
 .../eu/faircode/email/AdapterMessage.java     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3995dc094c..e7c791d746 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2876,7 +2876,29 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             if (event.getDateEnd() != null)
                                 ev.setDateEnd(event.getDateEnd());
 
-                            InternetAddress to = (InternetAddress) message.to[0];
+                            InternetAddress to = null;
+
+                            if (message.identity != null) {
+                                EntityIdentity identity = db.identity().getIdentity(message.identity);
+                                if (identity != null) {
+                                    InternetAddress same = null;
+                                    InternetAddress similar = null;
+                                    for (Address recipient : message.to)
+                                        if (identity.sameAddress(recipient))
+                                            same = (InternetAddress) recipient;
+                                        else if (identity.similarAddress(recipient))
+                                            similar = (InternetAddress) recipient;
+
+                                    if (same != null)
+                                        to = same;
+                                    else if (similar != null)
+                                        to = similar;
+                                }
+                            }
+
+                            if (to == null)
+                                to = (InternetAddress) message.to[0];
+
                             Attendee attendee = new Attendee(to.getPersonal(), to.getAddress());
 
                             if (action == R.id.btnCalendarAccept) {