Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 20:06:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow synchronization of sent folder to rebuild local contacts

Browse Source
This commit is contained in:
M66B
2019-03-16 19:54:59 +00:00
parent 2c4494ddb0
commit 8d0fb2d564
2 changed files with 28 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1229,50 +1229,54 @@ class Core {
attachment.id = db.attachment().insertAttachment(attachment);
}
if (!folder.isOutgoing() &&
!EntityFolder.ARCHIVE.equals(folder.type) &&
if (!EntityFolder.ARCHIVE.equals(folder.type) &&
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type)) {
Address[] replies = (message.reply != null ? message.reply : message.from);
if (replies != null) {
int type = (folder.isOutgoing() ? EntityContact.TYPE_TO : EntityContact.TYPE_FROM);
Address[] recipients = (type == EntityContact.TYPE_TO
? message.to
: (message.reply != null ? message.reply : message.from));
if (recipients != null) {
// Check if from self
boolean me = true;
for (Address reply : replies) {
String email = ((InternetAddress) reply).getAddress();
String canonical = Helper.canonicalAddress(email);
if (!TextUtils.isEmpty(email) &&
db.identity().getIdentity(folder.account, email.toLowerCase()) == null &&
(canonical.equals(email) ||
db.identity().getIdentity(folder.account, canonical) == null)) {
me = false;
break;
if (type == EntityContact.TYPE_FROM) {
boolean me = true;
for (Address reply : recipients) {
String email = ((InternetAddress) reply).getAddress();
String canonical = Helper.canonicalAddress(email);
if (!TextUtils.isEmpty(email) &&
db.identity().getIdentity(folder.account, email.toLowerCase()) == null &&
(canonical.equals(email) ||
db.identity().getIdentity(folder.account, canonical) == null)) {
me = false;
break;
}
}
if (me)
recipients = message.to;
}
if (me)
replies = message.to;
for (Address reply : replies) {
String email = ((InternetAddress) reply).getAddress();
String name = ((InternetAddress) reply).getPersonal();
Uri avatar = ContactInfo.getLookupUri(context, new Address[]{reply});
EntityContact contact = db.contact().getContact(EntityContact.TYPE_FROM, email);
for (Address recipient : recipients) {
String email = ((InternetAddress) recipient).getAddress();
String name = ((InternetAddress) recipient).getPersonal();
Uri avatar = ContactInfo.getLookupUri(context, new Address[]{recipient});
EntityContact contact = db.contact().getContact(type, email);
if (contact == null) {
contact = new EntityContact();
contact.type = EntityContact.TYPE_FROM;
contact.type = type;
contact.email = email;
contact.name = name;
contact.avatar = (avatar == null ? null : avatar.toString());
contact.times_contacted = 1;
contact.last_contacted = message.received;
contact.id = db.contact().insertContact(contact);
Log.i("Inserted sender contact=" + contact);
Log.i("Inserted contact=" + contact + " type=" + type);
} else {
contact.name = name;
contact.avatar = (avatar == null ? null : avatar.toString());
contact.times_contacted++;
contact.last_contacted = message.received;
db.contact().updateContact(contact);
Log.i("Updated sender contact=" + contact);
Log.i("Updated contact=" + contact + " type=" + type);
}
}
}

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

@@ -26,7 +26,6 @@ import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.Uri;
import android.os.PowerManager;
import android.text.TextUtils;
@@ -363,32 +362,6 @@ public class ServiceSend extends LifecycleService {
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.cancel("send", message.identity.intValue());
if (message.to != null)
for (Address recipient : message.to) {
String email = ((InternetAddress) recipient).getAddress();
String name = ((InternetAddress) recipient).getPersonal();
Uri avatar = ContactInfo.getLookupUri(this, new Address[]{recipient});
EntityContact contact = db.contact().getContact(EntityContact.TYPE_TO, email);
if (contact == null) {
contact = new EntityContact();
contact.type = EntityContact.TYPE_TO;
contact.email = email;
contact.name = name;
contact.avatar = (avatar == null ? null : avatar.toString());
contact.times_contacted = 1;
contact.last_contacted = time;
contact.id = db.contact().insertContact(contact);
Log.i("Inserted recipient contact=" + contact);
} else {
contact.name = name;
contact.avatar = (avatar == null ? null : avatar.toString());
contact.times_contacted++;
contact.last_contacted = time;
db.contact().updateContact(contact);
Log.i("Updated recipient contact=" + contact);
}
}
} catch (MessagingException ex) {
if (ex instanceof SendFailedException) {
SendFailedException sfe = (SendFailedException) ex;