|
|
@ -1503,6 +1503,7 @@ class Core {
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
boolean notify_known = prefs.getBoolean("notify_known", false);
|
|
|
|
boolean notify_known = prefs.getBoolean("notify_known", false);
|
|
|
|
|
|
|
|
boolean pro = ActivityBilling.isPro(context);
|
|
|
|
|
|
|
|
|
|
|
|
Log.i(folder.name + " POP sync type=" + folder.type + " connected=" + (ifolder != null));
|
|
|
|
Log.i(folder.name + " POP sync type=" + folder.type + " connected=" + (ifolder != null));
|
|
|
|
|
|
|
|
|
|
|
@ -1643,7 +1644,7 @@ class Core {
|
|
|
|
message.sender = MessageHelper.getSortKey(message.from);
|
|
|
|
message.sender = MessageHelper.getSortKey(message.from);
|
|
|
|
Uri lookupUri = ContactInfo.getLookupUri(message.from);
|
|
|
|
Uri lookupUri = ContactInfo.getLookupUri(message.from);
|
|
|
|
message.avatar = (lookupUri == null ? null : lookupUri.toString());
|
|
|
|
message.avatar = (lookupUri == null ? null : lookupUri.toString());
|
|
|
|
if (message.avatar == null && notify_known)
|
|
|
|
if (message.avatar == null && notify_known && pro)
|
|
|
|
message.ui_ignored = true;
|
|
|
|
message.ui_ignored = true;
|
|
|
|
|
|
|
|
|
|
|
|
// No MX check
|
|
|
|
// No MX check
|
|
|
@ -2147,6 +2148,7 @@ class Core {
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
boolean notify_known = prefs.getBoolean("notify_known", false);
|
|
|
|
boolean notify_known = prefs.getBoolean("notify_known", false);
|
|
|
|
|
|
|
|
boolean pro = ActivityBilling.isPro(context);
|
|
|
|
|
|
|
|
|
|
|
|
// Find message by uid (fast, no headers required)
|
|
|
|
// Find message by uid (fast, no headers required)
|
|
|
|
EntityMessage message = db.message().getMessageByUid(folder.id, uid);
|
|
|
|
EntityMessage message = db.message().getMessageByUid(folder.id, uid);
|
|
|
@ -2281,7 +2283,7 @@ class Core {
|
|
|
|
message.sender = MessageHelper.getSortKey(message.from);
|
|
|
|
message.sender = MessageHelper.getSortKey(message.from);
|
|
|
|
Uri lookupUri = ContactInfo.getLookupUri(message.from);
|
|
|
|
Uri lookupUri = ContactInfo.getLookupUri(message.from);
|
|
|
|
message.avatar = (lookupUri == null ? null : lookupUri.toString());
|
|
|
|
message.avatar = (lookupUri == null ? null : lookupUri.toString());
|
|
|
|
if (message.avatar == null && notify_known)
|
|
|
|
if (message.avatar == null && notify_known && pro)
|
|
|
|
message.ui_ignored = true;
|
|
|
|
message.ui_ignored = true;
|
|
|
|
|
|
|
|
|
|
|
|
boolean check_mx = prefs.getBoolean("check_mx", false);
|
|
|
|
boolean check_mx = prefs.getBoolean("check_mx", false);
|
|
|
|