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

Added permanent message delete

Browse Source
This commit is contained in:
M66B
2019-09-22 21:07:51 +02:00
parent 3506cbf1ee
commit aeff4e3169
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -2412,7 +2412,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.getMenu().findItem(R.id.menu_flag_color).setEnabled(message.uid != null && !message.folderReadOnly);
popupMenu.getMenu().findItem(R.id.menu_copy).setEnabled(message.uid != null && !message.folderReadOnly);
popupMenu.getMenu().findItem(R.id.menu_delete).setVisible(debug);
popupMenu.getMenu().findItem(R.id.menu_junk).setEnabled(message.uid != null && !message.folderReadOnly);
popupMenu.getMenu().findItem(R.id.menu_junk).setVisible(hasJunk && !EntityFolder.JUNK.equals(message.folderType));
@@ -2457,7 +2456,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onActionMove(message, true);
return true;
case R.id.menu_delete:
// For emergencies
onMenuDelete(message);
return true;
case R.id.menu_junk:
@@ -2836,24 +2834,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
private void onMenuDelete(final TupleMessageEx message) {
Bundle args = new Bundle();
args.putLong("id", message.id);
Bundle aargs = new Bundle();
aargs.putString("question", context.getString(R.string.title_ask_delete));
aargs.putLong("id", message.id);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
db.message().deleteMessage(id);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
}
}.execute(context, owner, args, "message:delete");
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(aargs);
ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_DELETE);
ask.show(parentFragment.getFragmentManager(), "message:delete");
}
private void onMenuJunk(final TupleMessageEx message) {

3
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -3964,6 +3964,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
nm.cancel("send:" + message.identity, 1);
}
} else if (message.uid == null) {
db.message().deleteMessage(id);
db.folder().setFolderError(message.folder, null);
} else
EntityOperation.queue(context, message, EntityOperation.DELETE);