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

Ask move for leave deleted

Browse Source
This commit is contained in:
M66B
2022-04-01 17:01:20 +02:00
parent f36a9e4eb6
commit 71ba40acf1
2 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5318,20 +5318,27 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
private void onActionDelete(TupleMessageEx message) {
boolean leaveDeleted =
(message.accountProtocol == EntityAccount.TYPE_POP &&
message.accountLeaveDeleted);
Bundle aargs = new Bundle();
aargs.putString("question", context.getString(R.string.title_ask_delete));
if (leaveDeleted)
aargs.putString("question", context.getResources()
.getQuantityString(R.plurals.title_moving_messages, 1, 1));
else
aargs.putString("question", context.getString(R.string.title_ask_delete));
aargs.putString("remark", message.getRemark());
aargs.putLong("id", message.id);
aargs.putInt("faq", 160);
aargs.putString("notagain", "delete_asked");
aargs.putString("accept", context.getString(R.string.title_ask_delete_accept));
if (!leaveDeleted)
aargs.putString("accept", context.getString(R.string.title_ask_delete_accept));
aargs.putBoolean("warning", true);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean delete_asked = prefs.getBoolean("delete_asked", false);
if (delete_asked ||
(message.accountProtocol == EntityAccount.TYPE_POP &&
message.accountLeaveDeleted)) {
if (delete_asked) {
Intent data = new Intent();
data.putExtra("args", aargs);
parentFragment.onActivityResult(FragmentMessages.REQUEST_MESSAGE_DELETE, RESULT_OK, data);