Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed timezone mapping

Browse Source
This commit is contained in:
M66B
2023-10-27 17:26:58 +02:00
parent 97a7dbfb56
commit 4f87b4a1ff
7 changed files with 22 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/eu/faircode/email/CalendarHelper.java
View File

@@ -33,9 +33,8 @@ import androidx.preference.PreferenceManager;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -44,13 +43,14 @@ import java.util.TimeZone;
import biweekly.ICalVersion;
import biweekly.ICalendar;
import biweekly.component.ICalComponent;
import biweekly.component.VAlarm;
import biweekly.component.VEvent;
import biweekly.io.ParseWarning;
import biweekly.io.TimezoneAssignment;
import biweekly.io.TimezoneInfo;
import biweekly.io.WriteContext;
import biweekly.io.scribe.property.RecurrenceRuleScribe;
import biweekly.io.text.ICalReader;
import biweekly.parameter.ParticipationStatus;
import biweekly.property.Action;
import biweekly.property.Attendee;
@@ -82,6 +82,17 @@ public class CalendarHelper {
return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime());
}
static ICalendar parse(Context context, File file) throws IOException {
try (ICalReader reader = new ICalReader(file)) {
ICalendar icalendar = reader.readNext();
for (ParseWarning warning : reader.getWarnings())
Log.i("Event warning " + warning);
return icalendar;
}
}
static Long exists(Context context, String selectedAccount, String selectedName, String uid) {
ContentResolver resolver = context.getContentResolver();
try (Cursor cursor = resolver.query(CalendarContract.Events.CONTENT_URI,
@@ -148,34 +159,6 @@ public class CalendarHelper {
String tzid = (tz == null ? null : tz.getID());
if (tzid == null)
tzid = TimeZone.getDefault().getID();
else
try (InputStream is = context.getAssets().open("windows_timezones.txt")) {
BufferedReader br = new BufferedReader(new InputStreamReader((is)));
String line;
while ((line = br.readLine()) != null) {
if (line.startsWith("#"))
continue;
String[] info = line.split(";");
if (info.length != 5)
continue;
if (!info[2].equalsIgnoreCase(tzid))
continue;
// Austria;AT;W. Europe Standard Time;(UTC+01:00);Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
String utc = info[3]
.replace("UTC", "GMT")
.replace("(", "")
.replace(")", "");
String _tzid = TimeZone.getTimeZone(utc).getID();
EntityLog.log(context, "Event map " + tzid + " to " + _tzid + " " + info[3]);
tz.setID(_tzid);
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
String rrule = null;
RecurrenceRule recurrence = event.getRecurrenceRule();