Skip to content

Fix linter errors on react native 0.74 #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix linter errors on react native 0.74 #452

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bac13ea
Fix linter errors on react native 0.74
ipoogleduck Aug 27, 2024
b4762d5
Oops revert one fix
ipoogleduck Aug 27, 2024
2c27679
Another fix with column index!
ipoogleduck Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions android/src/main/java/com/calendarevents/RNCalendarEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,8 +1087,9 @@ private WritableNativeMap serializeEvent(Cursor cursor) {
recurrenceRule.putString("frequency", recurrenceRules[0].split("=")[1].toLowerCase());
}

if (cursor.getColumnIndex(CalendarContract.Events.DURATION) != -1 && cursor.getString(cursor.getColumnIndex(CalendarContract.Events.DURATION)) != null) {
recurrenceRule.putString("duration", cursor.getString(cursor.getColumnIndex(CalendarContract.Events.DURATION)));
int durationIndex = cursor.getColumnIndex(CalendarContract.Events.DURATION);
if (durationIndex != -1 && cursor.getString(durationIndex) != null) {
recurrenceRule.putString("duration", cursor.getString(durationIndex));
}

if (recurrenceRules.length >= 2 && recurrenceRules[1].split("=")[0].equals("INTERVAL")) {
Expand All @@ -1112,8 +1113,20 @@ private WritableNativeMap serializeEvent(Cursor cursor) {
}

event.putString("id", cursor.getString(0));
event.putMap("calendar", findCalendarById(cursor.getString(cursor.getColumnIndex("calendar_id"))));
event.putString("title", cursor.getString(cursor.getColumnIndex("title")));
int calendarIdIndex = cursor.getColumnIndex("calendar_id");
if (calendarIdIndex != -1) {
String calendarId = cursor.getString(calendarIdIndex);
if (calendarId != null) {
event.putMap("calendar", findCalendarById(calendarId));
}
}
int titleIndex = cursor.getColumnIndex("title");
if (titleIndex != -1) {
String title = cursor.getString(titleIndex);
if (title != null) {
event.putString("title", title);
}
}
event.putString("description", cursor.getString(2));
event.putString("startDate", startDateUTC);
event.putString("endDate", endDateUTC);
Expand All @@ -1129,12 +1142,14 @@ private WritableNativeMap serializeEvent(Cursor cursor) {
event.putArray("alarms", emptyAlarms);
}

if (cursor.getColumnIndex(CalendarContract.Events.ORIGINAL_ID) != -1 && cursor.getString(cursor.getColumnIndex(CalendarContract.Events.ORIGINAL_ID)) != null) {
event.putString("originalId", cursor.getString(cursor.getColumnIndex(CalendarContract.Events.ORIGINAL_ID)));
int originalIdIndex = cursor.getColumnIndex(CalendarContract.Events.ORIGINAL_ID);
if (originalIdIndex != -1 && cursor.getString(originalIdIndex) != null) {
event.putString("originalId", cursor.getString(originalIdIndex));
}

if (cursor.getColumnIndex(CalendarContract.Instances.ORIGINAL_SYNC_ID) != -1 && cursor.getString(cursor.getColumnIndex(CalendarContract.Instances.ORIGINAL_SYNC_ID)) != null) {
event.putString("syncId", cursor.getString(cursor.getColumnIndex(CalendarContract.Instances.ORIGINAL_SYNC_ID)));
int originalSyncIdIndex = cursor.getColumnIndex(CalendarContract.Instances.ORIGINAL_SYNC_ID);
if (originalSyncIdIndex != -1 && cursor.getString(originalSyncIdIndex) != null) {
event.putString("syncId", cursor.getString(originalSyncIdIndex));
}

return event;
Expand Down