mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Prevent download/save of sub attachments

Browse source
This commit is contained in:
M66B 2022-03-11 13:04:28 +01:00
parent 19d59a2203
commit 889ab22848
2 changed files with 53 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -3062,28 +3062,36 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean show_inline = properties.getValue("inline", message.id);
Log.i("Show inline=" + show_inline);
boolean has_inline = false;
int download = 0;
boolean save = (attachments.size() > 1);
int available = 0;
int unavailable = 0;
int downloadable = 0;
boolean downloading = false;
boolean has_inline = false;
EntityAttachment calendar = null;
List<EntityAttachment> a = new ArrayList<>();
List<EntityAttachment> show = new ArrayList<>();
for (EntityAttachment attachment : attachments) {
if (attachment.subsequence == null) {
if (attachment.available)
available++;
else
unavailable++;
if (attachment.progress == null) {
if (!attachment.available)
downloadable++;
} else
downloading = true;
}
boolean inline = (attachment.isEncryption() ||
"text/x-amp-html".equals(attachment.type) ||
(attachment.isInline() && attachment.isImage()));
if (inline && attachment.available)
has_inline = true;
if (attachment.progress == null && !attachment.available)
download++;
if (!attachment.available)
save = false;
if (attachment.progress != null)
downloading = true;
if (show_inline || !inline || !attachment.available)
a.add(attachment);
show.add(attachment);
if (attachment.available &&
"text/calendar".equals(attachment.getMimeType()))
@ -3094,7 +3102,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
public void run() {
try {
adapterAttachment.set(a);
adapterAttachment.set(show);
} catch (Throwable ex) {
Log.e(ex);
}
@ -3108,8 +3116,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
cbInline.setChecked(show_inline);
cbInline.setVisibility(has_inline ? View.VISIBLE : View.GONE);
ibSaveAttachments.setVisibility(save ? View.VISIBLE : View.GONE);
ibDownloadAttachments.setVisibility(download > 1 && suitable ? View.VISIBLE : View.GONE);
ibSaveAttachments.setVisibility(available > 1 && unavailable == 0 ? View.VISIBLE : View.GONE);
ibDownloadAttachments.setVisibility(downloadable > 1 && suitable ? View.VISIBLE : View.GONE);
tvNoInternetAttachments.setVisibility(downloading && !suitable ? View.VISIBLE : View.GONE);
cbInline.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {

61
app/src/main/java/eu/faircode/email/FragmentBase.java
View file

@ -573,41 +573,42 @@ public class FragmentBase extends Fragment {
DB db = DB.getInstance(context);
DocumentFile tree = DocumentFile.fromTreeUri(context, uri);
List<EntityAttachment> attachments = db.attachment().getAttachments(id);
for (EntityAttachment attachment : attachments) {
File file = attachment.getFile(context);
for (EntityAttachment attachment : attachments)
if (attachment.subsequence == null) {
File file = attachment.getFile(context);
String name = Helper.sanitizeFilename(attachment.name);
if (TextUtils.isEmpty(name))
name = Long.toString(attachment.id);
DocumentFile document = tree.createFile(attachment.getMimeType(), name);
if (document == null)
throw new FileNotFoundException("Could not save " + uri + ":" + name);
String name = Helper.sanitizeFilename(attachment.name);
if (TextUtils.isEmpty(name))
name = Long.toString(attachment.id);
DocumentFile document = tree.createFile(attachment.getMimeType(), name);
if (document == null)
throw new FileNotFoundException("Could not save " + uri + ":" + name);
OutputStream os = null;
InputStream is = null;
try {
os = context.getContentResolver().openOutputStream(document.getUri());
is = new FileInputStream(file);
byte[] buffer = new byte[Helper.BUFFER_SIZE];
int read;
while ((read = is.read(buffer)) != -1)
os.write(buffer, 0, read);
} finally {
OutputStream os = null;
InputStream is = null;
try {
if (os != null)
os.close();
} catch (Throwable ex) {
Log.w(ex);
}
try {
if (is != null)
is.close();
} catch (Throwable ex) {
Log.w(ex);
os = context.getContentResolver().openOutputStream(document.getUri());
is = new FileInputStream(file);
byte[] buffer = new byte[Helper.BUFFER_SIZE];
int read;
while ((read = is.read(buffer)) != -1)
os.write(buffer, 0, read);
} finally {
try {
if (os != null)
os.close();
} catch (Throwable ex) {
Log.w(ex);
}
try {
if (is != null)
is.close();
} catch (Throwable ex) {
Log.w(ex);
}
}
}
}
return null;
}