Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 07:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small improvement

Browse Source
This commit is contained in:
M66B
2019-07-15 12:27:58 +02:00
parent d4f330e1af
commit d593c230ce
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,7 +417,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
account, browsable,
ifolder, (IMAPMessage) isub[j],
true,
rules);
rules, null);
found++;
}
db.message().setMessageFound(message.account, message.thread);

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

@@ -1198,7 +1198,7 @@ class Core {
account, folder,
ifolder, (IMAPMessage) isub[j],
false,
rules);
rules, state);
ids[from + j] = message.id;
} catch (MessageRemovedException ex) {
Log.w(folder.name, ex);
@@ -1305,7 +1305,7 @@ class Core {
EntityAccount account, EntityFolder folder,
IMAPFolder ifolder, IMAPMessage imessage,
boolean browsed,
List<EntityRule> rules) throws MessagingException, IOException {
List<EntityRule> rules, State state) throws MessagingException, IOException {
long uid = ifolder.getUID(imessage);
if (imessage.isExpunged()) {
@@ -1467,27 +1467,33 @@ class Core {
if (message.received > account.created)
updateContactInfo(context, folder, message);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
long maxSize = prefs.getInt("download", 0);
if (maxSize == 0)
maxSize = MessageHelper.SMALL_MESSAGE_SIZE;
else
maxSize = Math.min(maxSize, MessageHelper.SMALL_MESSAGE_SIZE);
// Download small messages inline
if (message.size != null && message.size < maxSize) {
String body = parts.getHtml(context);
Helper.writeText(message.getFile(context), body);
db.message().setMessageContent(message.id,
true,
parts.isPlainOnly(),
HtmlHelper.getPreview(body),
parts.getWarnings(message.warning));
Log.i(folder.name + " inline downloaded message id=" + message.id +
" size=" + message.size + "/" + (body == null ? null : body.length()));
if (message.size != null) {
long maxSize;
if (state == null || state.networkState.isUnmetered())
maxSize = MessageHelper.SMALL_MESSAGE_SIZE;
else {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int download = prefs.getInt("download", 0);
maxSize = (download == 0
? MessageHelper.SMALL_MESSAGE_SIZE
: Math.min(download, MessageHelper.SMALL_MESSAGE_SIZE));
}
if (!TextUtils.isEmpty(body))
fixAttachments(context, message.id, body);
if (message.size < maxSize) {
String body = parts.getHtml(context);
Helper.writeText(message.getFile(context), body);
db.message().setMessageContent(message.id,
true,
parts.isPlainOnly(),
HtmlHelper.getPreview(body),
parts.getWarnings(message.warning));
Log.i(folder.name + " inline downloaded message id=" + message.id +
" size=" + message.size + "/" + (body == null ? null : body.length()));
if (!TextUtils.isEmpty(body))
fixAttachments(context, message.id, body);
}
}
} else {

6
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -832,7 +832,8 @@ public class ServiceSynchronize extends LifecycleService {
account, folder,
ifolder, (IMAPMessage) imessage,
false,
db.rule().getEnabledRules(folder.id));
db.rule().getEnabledRules(folder.id),
state);
if (db.folder().getFolderDownload(folder.id))
Core.downloadMessage(ServiceSynchronize.this,
@@ -924,7 +925,8 @@ public class ServiceSynchronize extends LifecycleService {
account, folder,
ifolder, (IMAPMessage) e.getMessage(),
false,
db.rule().getEnabledRules(folder.id));
db.rule().getEnabledRules(folder.id),
state);
if (db.folder().getFolderDownload(folder.id))
Core.downloadMessage(ServiceSynchronize.this,