From 267c9cffb124e81992ebcf72443793770b0857a7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:52:03 +0200
Subject: [PATCH] Fix

---
 .../java/eu/faircode/email/MessageHelper.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 26bb10094e..d9ad11d275 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -4416,9 +4416,6 @@ public class MessageHelper {
         private void decodeICalendar(Context context, EntityAttachment local) {
             DB db = DB.getInstance(context);
             try {
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                boolean ical_tentative = prefs.getBoolean("ical_tentative", true);
-
                 boolean permission = Helper.hasPermission(context, Manifest.permission.WRITE_CALENDAR);
 
                 EntityMessage message = db.message().getMessage(local.message);
@@ -4430,17 +4427,19 @@ public class MessageHelper {
                                 EntityFolder.SYSTEM.equals(folder.type) ||
                                 EntityFolder.USER.equals(folder.type)));
 
-                if (!permission || !received || account == null || account.calendar == null || !ical_tentative) {
+                if (!permission || !received || account == null || account.calendar == null) {
                     EntityLog.log(context, "Event not processed" +
                             " permission=" + permission +
                             " account=" + (account != null) +
                             " folder=" + (folder != null) + ":" + (folder == null ? null : folder.type) +
                             " received=" + received +
-                            " calendar=" + (account == null ? null : account.calendar) +
-                            " tentative=" + ical_tentative);
+                            " calendar=" + (account == null ? null : account.calendar));
                     return;
                 }
 
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean ical_tentative = prefs.getBoolean("ical_tentative", true);
+
                 File file = local.getFile(context);
                 ICalendar icalendar = Biweekly.parse(file).first();
 
@@ -4450,10 +4449,13 @@ public class MessageHelper {
                 // https://www.rfc-editor.org/rfc/rfc5546#section-3.2
                 if (method != null && method.isCancel())
                     CalendarHelper.delete(context, event, message);
-                else if (method == null || method.isRequest())
-                    CalendarHelper.insert(context, icalendar, event,
-                            CalendarContract.Events.STATUS_TENTATIVE, account, message);
-                else
+                else if (method == null || method.isRequest()) {
+                    if (ical_tentative)
+                        CalendarHelper.insert(context, icalendar, event,
+                                CalendarContract.Events.STATUS_TENTATIVE, account, message);
+                    else
+                        EntityLog.log(context, "Tentative event not stored");
+                } else
                     EntityLog.log(context, "Unknown event method=" + method.getValue());
             } catch (Throwable ex) {
                 Log.w(ex);