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

Revert "Download related attachment"

Browse Source 
This reverts commit cfbe4e0590.
This commit is contained in:
M66B
2021-03-18 17:46:20 +01:00
parent 0c49e7812f
commit 8bfa985d01
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2022,7 +2022,7 @@ public class MessageHelper {
return null;
}
void downloadAttachment(Context context, EntityAttachment local, Long related) throws IOException, MessagingException {
void downloadAttachment(Context context, EntityAttachment local) throws IOException, MessagingException {
List<EntityAttachment> remotes = getAttachments();
// Some servers order attachments randomly
@@ -2084,13 +2084,13 @@ public class MessageHelper {
if (index < 0)
throw new IllegalArgumentException("Attachment not found");
downloadAttachment(context, index, local, related);
downloadAttachment(context, index, local);
if (Helper.isTnef(local.type, local.name))
decodeTNEF(context, local);
}
void downloadAttachment(Context context, int index, EntityAttachment local, Long related) throws MessagingException, IOException {
void downloadAttachment(Context context, int index, EntityAttachment local) throws MessagingException, IOException {
Log.i("downloading attachment id=" + local.id + " index=" + index + " " + local);
DB db = DB.getInstance(context);
@@ -2101,8 +2101,6 @@ public class MessageHelper {
// Download attachment
File file = EntityAttachment.getFile(context, local.id, local.name);
db.attachment().setProgress(local.id, 0);
if (related != null)
db.attachment().setProgress(related, 0);
if (EntityAttachment.PGP_CONTENT.equals(apart.encrypt) ||
EntityAttachment.SMIME_CONTENT.equals(apart.encrypt)) {
@@ -2143,10 +2141,7 @@ public class MessageHelper {
long now = System.currentTimeMillis();
if (now - lastprogress > ATTACHMENT_PROGRESS_UPDATE) {
lastprogress = now;
int progress = (int) (size * 100 / total);
db.attachment().setProgress(local.id, progress);
if (related != null)
db.attachment().setProgress(related, progress);
db.attachment().setProgress(local.id, (int) (size * 100 / total));
}
}
}
@@ -2154,11 +2149,6 @@ public class MessageHelper {
// Store attachment data
db.attachment().setDownloaded(local.id, size);
if (related != null) {
File rel = EntityAttachment.getFile(context, related, local.name);
Helper.copy(file, rel);
db.attachment().setDownloaded(related, size);
}
Log.i("Downloaded attachment size=" + size);
} catch (FolderClosedIOException ex) {