From ef061a965f5ffd1452db187b8e8afe1bb40e05b9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 18 May 2023 09:23:26 +0200
Subject: [PATCH] Insert confirmed calendar events

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java   | 1 -
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ca0b15f50a..ecb3a4bc9e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3712,7 +3712,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 Bundle args = new Bundle();
                 args.putLong("message", message.id);
                 args.putLong("account", message.account);
-                args.putInt("status", CalendarContract.Events.STATUS_TENTATIVE);
 
                 new SimpleTask<String>() {
                     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8dd3ca221d..5cf89c0f47 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -238,6 +238,7 @@ import javax.mail.internet.MimeMessage;
 import biweekly.Biweekly;
 import biweekly.ICalendar;
 import biweekly.component.VEvent;
+import biweekly.property.Status;
 import me.everything.android.ui.overscroll.IOverScrollDecor;
 import me.everything.android.ui.overscroll.IOverScrollState;
 import me.everything.android.ui.overscroll.IOverScrollStateListener;
@@ -9735,7 +9736,6 @@ public class FragmentMessages extends FragmentBase
             @Override
             protected Long onExecute(Context context, Bundle args) throws Throwable {
                 long id = args.getLong("message");
-                int status = args.getInt("status");
                 String selectedAccount = args.getString("account");
                 String selectedName = args.getString("name");
 
@@ -9760,6 +9760,11 @@ public class FragmentMessages extends FragmentBase
                 ICalendar icalendar = Biweekly.parse(calendar.getFile(context)).first();
                 VEvent event = icalendar.getEvents().get(0);
 
+                int status = CalendarContract.Events.STATUS_TENTATIVE;
+                if (event.getStatus() != null &&
+                        Status.CONFIRMED.equals(event.getStatus().getValue()))
+                    status = CalendarContract.Events.STATUS_CONFIRMED;
+
                 return CalendarHelper.insert(context, icalendar, event, status,
                         selectedAccount, selectedName, message);
             }