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

Added renaming of attachments

Browse Source
This commit is contained in:
M66B
2024-06-06 17:24:36 +02:00
parent f64961b224
commit f162304427
4 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -348,7 +348,8 @@ public class FragmentCompose extends FragmentBase {
private static final int REQUEST_LINK = 14;
private static final int REQUEST_DISCARD = 15;
private static final int REQUEST_SEND = 16;
private static final int REQUEST_REMOVE_ATTACHMENTS = 17;
static final int REQUEST_EDIT_ATTACHMENT = 17;
private static final int REQUEST_REMOVE_ATTACHMENTS = 18;
ActivityResultLauncher<PickVisualMediaRequest> pickImages;
@@ -3373,6 +3374,10 @@ public class FragmentCompose extends FragmentBase {
onAction(R.id.action_send, extras, "sendnow");
}
break;
case REQUEST_EDIT_ATTACHMENT:
if (resultCode == RESULT_OK && data != null)
onEditAttachment(data.getBundleExtra("args"));
break;
case REQUEST_REMOVE_ATTACHMENTS:
if (resultCode == RESULT_OK)
onRemoveAttachments();
@@ -4965,6 +4970,45 @@ public class FragmentCompose extends FragmentBase {
onAction(R.id.action_delete, "delete");
}
private void onEditAttachment(Bundle args) {
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
String prev = args.getString("prev");
String name = args.getString("name");
if (TextUtils.isEmpty(name))
return null;
name = Helper.sanitizeFilename(name);
File source = EntityAttachment.getFile(context, id, prev);
File target = EntityAttachment.getFile(context, id, name);
if (!source.renameTo(target))
throw new IllegalArgumentException("Could not rename " + source.getName() + " into " + target.getName());
DB db = DB.getInstance(context);
try {
db.beginTransaction();
db.attachment().setName(id, name);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "attachment:edit");
}
private void onRemoveAttachments() {
Bundle args = new Bundle();
args.putLong("id", working);