mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-21 13:47:04 +00:00
Code Issues Releases Wiki Activity

Get attachment URI with name

Browse source
This commit is contained in:
M66B 2023-01-05 15:21:22 +01:00
parent 35259ba80a
commit 2e07080feb
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/AdapterAttachment.java
View file

@ -299,13 +299,9 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
private boolean onShare(final EntityAttachment attachment) {
try {
File file = attachment.getFile(context);
Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
// TODO: consider using getUriForFile(..., displayName)
new ShareCompat.IntentBuilder(context)
.setType(attachment.getMimeType())
.addStream(uri)
.addStream(attachment.getUri(context))
.setChooserTitle(R.string.title_select_app)
.startChooser();

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

@ -3971,11 +3971,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ArrayList<Uri> result = new ArrayList<>();
for (EntityAttachment attachment : attachments)
if (attachment.available &&
attachment.isAttachment() && attachment.isImage()) {
File file = attachment.getFile(context);
Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
result.add(uri);
}
attachment.isAttachment() && attachment.isImage())
result.add(attachment.getUri(context));
return result;
}
@ -5320,10 +5317,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (attachment == null)
return;
File file = attachment.getFile(context);
Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
context.startActivity(new Intent(context, ActivityAMP.class)
.setData(uri)
.setData(attachment.getUri(context))
.putExtra("id", attachment.message));
}

10
app/src/main/java/eu/faircode/email/EntityAttachment.java
View file

@ -23,9 +23,11 @@ import static androidx.room.ForeignKey.CASCADE;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import androidx.preference.PreferenceManager;
import androidx.room.Entity;
import androidx.room.ForeignKey;
@ -153,6 +155,14 @@ public class EntityAttachment {
return (encryption != null);
}
Uri getUri(Context context) {
File file = getFile(context);
if (TextUtils.isEmpty(name))
return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
else
return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file, name);
}
File getFile(Context context) {
return getFile(context, id, name);
}