From aadcbaed8d272e7cc90cd023ca6f54e32c534122 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 26 Sep 2024 17:27:16 +0200 Subject: [PATCH] Purge local messages --- .../eu/faircode/email/FragmentDialogContactGroup.java | 8 ++++++++ app/src/main/java/eu/faircode/email/FragmentMessages.java | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogContactGroup.java b/app/src/main/java/eu/faircode/email/FragmentDialogContactGroup.java index 2d4a58a04d..2a5224b726 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogContactGroup.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogContactGroup.java @@ -116,6 +116,14 @@ public class FragmentDialogContactGroup extends FragmentDialogBase { @Override protected void onExecuted(Bundle args, Cursor cursor) { + if (cursor == null) + EntityLog.log(getContext(), "MMM cursor is null"); + else { + EntityLog.log(getContext(), "MMM cursor count=" + cursor.getCount()); + for (int col = 0; col < cursor.getColumnCount(); col++) + EntityLog.log(getContext(), "MMM " + col + "=" + cursor.getColumnName(col)); + } + SimpleCursorAdapter adapter = new SimpleCursorAdapter( context, R.layout.spinner_contact_group, diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 9c83b6a80d..381629267d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -11160,8 +11160,14 @@ public class FragmentMessages extends FragmentBase if (message == null) continue; - if (message.uid != null || account.protocol == EntityAccount.TYPE_POP) + if (account.protocol == EntityAccount.TYPE_POP) db.message().setMessageUiHide(message.id, true); + else { + if (message.uid == null) + db.message().deleteMessage(id); + else + db.message().setMessageUiHide(message.id, true); + } } EntityOperation.queue(context, folder, EntityOperation.PURGE);