From b48fde45400a6f27e6cf89439eeebc231f3467f2 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 10 Jun 2025 11:11:16 +0200 Subject: [PATCH] Small improvements --- app/src/main/java/eu/faircode/email/ActivityCompose.java | 2 +- app/src/main/java/eu/faircode/email/FragmentCompose.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java index 76262e1975..03ffdd0e7a 100644 --- a/app/src/main/java/eu/faircode/email/ActivityCompose.java +++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java @@ -276,7 +276,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB break; } if (!found) - uris.add(new UriType(stream, streams.size() == 1 ? intent.getType() : null, this)); + uris.add(new UriType(stream, intent.getType(), this)); } } } diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index adbc057c44..2f28551d7c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -393,7 +393,7 @@ public class FragmentCompose extends FragmentBase { pickImages = registerForActivityResult(new ActivityResultContracts.PickMultipleVisualMedia(max), uris -> { if (!uris.isEmpty()) - onAddImageFile(UriType.getList(uris, getContext()), false); + onAddImageFile(UriType.getList(uris, null), false); }); } @@ -655,7 +655,7 @@ public class FragmentCompose extends FragmentBase { int resize = prefs.getInt("resize", FragmentCompose.REDUCED_IMAGE_SIZE); boolean resize_width_only = prefs.getBoolean("resize_width_only", false); onAddAttachment( - Arrays.asList(new UriType(uri, type, etBody.getContext())), + Arrays.asList(new UriType(uri, type, null)), true, resize_paste ? resize : 0, resize_width_only, @@ -3382,7 +3382,7 @@ public class FragmentCompose extends FragmentBase { case REQUEST_TAKE_PHOTO: if (resultCode == RESULT_OK) { if (photoURI != null) - onAddImageFile(Arrays.asList(new UriType(photoURI, (String) null, getContext())), false); + onAddImageFile(Arrays.asList(new UriType(photoURI, (String) null, null)), false); } break; case REQUEST_ATTACHMENT: @@ -3961,7 +3961,7 @@ public class FragmentCompose extends FragmentBase { if (result.size() == 0 && data.hasExtra("media-uri-list")) try { List uris = data.getParcelableArrayListExtra("media-uri-list"); - result.addAll(UriType.getList(uris, getContext())); + result.addAll(UriType.getList(uris, null)); } catch (Throwable ex) { Log.e(ex); }