From 0f23591ff029d154b6668e1b1682af46cb1a9ee8 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 2 Jul 2025 19:17:31 +0200 Subject: [PATCH] Delete event logging --- .../java/eu/faircode/email/CalendarHelper.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/CalendarHelper.java b/app/src/main/java/eu/faircode/email/CalendarHelper.java index 1b3727cd09..b6e983c799 100644 --- a/app/src/main/java/eu/faircode/email/CalendarHelper.java +++ b/app/src/main/java/eu/faircode/email/CalendarHelper.java @@ -498,19 +498,25 @@ public class CalendarHelper { static void delete(Context context, ICalendar icalendar, VEvent event, EntityAccount account, EntityMessage message) { String uid = (event.getUid() == null ? null : event.getUid().getValue()); - if (TextUtils.isEmpty(uid)) + if (TextUtils.isEmpty(uid)) { + EntityLog.log(context, "Delete event without uid"); return; + } RecurrenceId recurrenceId = event.getProperty(biweekly.property.RecurrenceId.class); if (recurrenceId != null) { ICalDate start = recurrenceId.getValue(); - if (!start.hasTime()) + if (!start.hasTime()) { + EntityLog.log(context, "Delete recurring event without start time"); return; + } Pair selected = getSelectedCalendar(account); Long existId = exists(context, selected.first, selected.second, uid); - if (existId == null) + if (existId == null) { + EntityLog.log(context, "Existing recurring event not found uid=" + uid); return; + } ContentValues values = new ContentValues(); values.put(CalendarContract.Events.ORIGINAL_INSTANCE_TIME, start.getTime()); @@ -527,6 +533,7 @@ public class CalendarHelper { } ContentResolver resolver = context.getContentResolver(); + boolean found = false; try (Cursor cursor = resolver.query(CalendarContract.Events.CONTENT_URI, new String[]{CalendarContract.Events._ID}, CalendarContract.Events.UID_2445 + " = ? ", @@ -540,7 +547,10 @@ public class CalendarHelper { int rows = resolver.delete(deleteUri, null, null); EntityLog.log(context, EntityLog.Type.General, message, "Deleted event id=" + eventId + " uid=" + uid + " rows=" + rows); + found = true; } } + if (!found) + EntityLog.log(context, "Delete event not found uid=" + uid); } }