diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java index 47b4c0f586..c5d99fe376 100644 --- a/app/src/main/java/eu/faircode/email/AdapterFolder.java +++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java @@ -343,29 +343,43 @@ public class AdapterFolder extends RecyclerView.Adapter() { - @Override - protected Void onExecute(Context context, Bundle args) { - long id = args.getLong("id"); - boolean browsed = args.getBoolean("browsed"); - Log.i("Delete local messages browsed=" + browsed); - if (browsed) - DB.getInstance(context).message().deleteBrowsedMessages(id); - else - DB.getInstance(context).message().deleteLocalMessages(id); - return null; - } + tvMessage.setText(context.getText(R.string.title_ask_delete_local)); - @Override - public void onException(Bundle args, Throwable ex) { - Helper.unexpectedError(context, owner, ex); - } - }.execute(context, owner, args, "folder:delete:local"); + new DialogBuilderLifecycle(context, owner) + .setView(dview) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Bundle args = new Bundle(); + args.putLong("id", folder.id); + args.putBoolean("browsed", browsed); + + new SimpleTask() { + @Override + protected Void onExecute(Context context, Bundle args) { + long id = args.getLong("id"); + boolean browsed = args.getBoolean("browsed"); + Log.i("Delete local messages browsed=" + browsed); + if (browsed) + DB.getInstance(context).message().deleteBrowsedMessages(id); + else + DB.getInstance(context).message().deleteLocalMessages(id); + return null; + } + + @Override + public void onException(Bundle args, Throwable ex) { + Helper.unexpectedError(context, owner, ex); + } + }.execute(context, owner, args, "folder:delete:local"); + } + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); } private void onActionEmptyTrash() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df30a428a1..538b866d85 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -373,6 +373,7 @@ Showing the original message can leak privacy sensitive information Showing images can leak privacy sensitive information Edit reformatted replied/forwarded message text? + Delete local messages which are stored on the remote server too? Compose From: