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

Revert "Added option to disable storing events as tentative"

Browse Source 
This reverts commit 61eba3e652.
This commit is contained in:
M66B
2023-10-26 12:52:29 +02:00
parent e9616439ac
commit c72d2cf0ff
4 changed files with 5 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -159,7 +159,6 @@ import biweekly.Biweekly;
import biweekly.ICalendar;
import biweekly.component.VEvent;
import biweekly.property.Method;
import biweekly.property.Status;
import ezvcard.VCard;
import ezvcard.VCardVersion;
import ezvcard.io.text.VCardWriter;
@@ -4417,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);
@@ -4451,21 +4447,6 @@ public class MessageHelper {
if (method != null && method.isCancel())
CalendarHelper.delete(context, event, message);
else if (method == null || method.isRequest() || method.isReply()) {
int status = CalendarContract.Events.STATUS_TENTATIVE;
if (method != null && method.isReply()) {
Status istatus = event.getStatus();
if (istatus != null)
if (Status.ACCEPTED.equals(istatus.getValue()))
status = CalendarContract.Events.STATUS_CONFIRMED;
else if (Status.CANCELLED.equals(istatus.getValue()))
status = CalendarContract.Events.STATUS_CANCELED;
}
if (status == CalendarContract.Events.STATUS_TENTATIVE && !ical_tentative) {
EntityLog.log(context, "Tentative event not processed");
return;
}
String selectedAccount;
String selectedName;
try {
@@ -4478,7 +4459,9 @@ public class MessageHelper {
selectedName = null;
}
CalendarHelper.insert(context, icalendar, event, status, selectedAccount, selectedName, message);
CalendarHelper.insert(context, icalendar, event,
CalendarContract.Events.STATUS_TENTATIVE,
selectedAccount, selectedName, message);
} else
EntityLog.log(context, "Unknown event method=" + method.getValue());
} catch (Throwable ex) {