[TIMOB-24248] Android: Ti.Calendar Recurring Events are not clearly exposed #9412
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,9 @@ | |
| import android.provider.CalendarContract.Instances; | ||
|
|
||
| // Columns and value constants taken from android.provider.Calendar in the android source base | ||
| @Kroll.proxy(parentModule=CalendarModule.class, propertyAccessors = { | ||
| TiC.PROPERTY_RECURRENCE_RULES | ||
| }) | ||
| public class EventProxy extends KrollProxy { | ||
| public static final String TAG = "EventProxy"; | ||
|
|
||
|
|
@@ -47,7 +49,7 @@ public class EventProxy extends KrollProxy { | |
| protected int status, visibility; | ||
| protected KrollDict extendedProperties = new KrollDict(); | ||
|
|
||
| protected String recurrenceDate, recurrenceExceptionRule, recurrenceExceptionDate; | ||
| protected Date lastDate; | ||
|
|
||
| public EventProxy() | ||
|
|
@@ -96,7 +98,8 @@ public static ArrayList<EventProxy> queryEventsBetweenDates(long date1, long dat | |
| } | ||
|
|
||
| Cursor eventCursor = contentResolver.query(builder.build(), new String[] { "event_id", "title", "description", | ||
| "eventLocation", "begin", "end", "allDay", "hasAlarm", "eventStatus", visibility, Events.RRULE, | ||
| Events.CALENDAR_ID }, query, queryArgs, | ||
| "startDay ASC, startMinute ASC"); | ||
|
|
||
| if (eventCursor == null) { | ||
|
|
@@ -117,7 +120,16 @@ public static ArrayList<EventProxy> queryEventsBetweenDates(long date1, long dat | |
| event.hasAlarm = !eventCursor.getString(7).equals("0"); | ||
| event.status = eventCursor.getInt(8); | ||
| event.visibility = eventCursor.getInt(9); | ||
| // Guarding against Cursor implementations which would throw an exception | ||
| // instead of returning null if no recurrence rule is added to the event | ||
| String recurrenceRule = null; | ||
| try { | ||
| recurrenceRule = eventCursor.getString(10); | ||
| } catch (Exception e) { | ||
| Log.w(TAG, "Trying to get a recurrence rule for an event without one."); | ||
| e.printStackTrace(); | ||
| } | ||
| event.setRecurrenceRules(recurrenceRule, eventCursor.getInt(11)); | ||
| events.add(event); | ||
| } | ||
|
|
||
|
|
@@ -126,6 +138,16 @@ public static ArrayList<EventProxy> queryEventsBetweenDates(long date1, long dat | |
| return events; | ||
| } | ||
|
|
||
| @Kroll.method | ||
| public void save() { | ||
| // Currently only saving added recurrenceRules. | ||
| String ruleToSave = ((RecurrenceRuleProxy) ((Object[]) getProperty(TiC.PROPERTY_RECURRENCE_RULES))[0]).generateRRULEString(); | ||
| ContentValues contentValues = new ContentValues(); | ||
| contentValues.put(Events.RRULE, ruleToSave); | ||
|
There was a problem hiding this comment. Not a huge fan of the truncated constant name here: There was a problem hiding this comment. This is an Android constant: |
||
| ContentResolver contentResolver = TiApplication.getInstance().getContentResolver(); | ||
| contentResolver.update(Events.CONTENT_URI, contentValues, Events._ID+"=?", new String[]{id}); | ||
| } | ||
|
|
||
| public static ArrayList<EventProxy> queryEvents(Uri uri, String query, String[] queryArgs, String orderBy) | ||
| { | ||
| ArrayList<EventProxy> events = new ArrayList<EventProxy>(); | ||
|
|
@@ -319,6 +341,10 @@ public ReminderProxy createReminder(KrollDict data) | |
| return ReminderProxy.createReminder(this, minutes, method); | ||
| } | ||
|
|
||
| @Kroll.method RecurrenceRuleProxy createRecurrenceRule(KrollDict data) { | ||
| return new RecurrenceRuleProxy(data); | ||
| } | ||
|
|
||
| @Kroll.method @Kroll.getProperty | ||
| public AlertProxy[] getAlerts() | ||
| { | ||
|
|
@@ -404,10 +430,13 @@ public int getVisibility() | |
| return visibility; | ||
| } | ||
|
|
||
| public void setRecurrenceRules(String rrule, int calendarID) | ||
| { | ||
| RecurrenceRuleProxy[] result = new RecurrenceRuleProxy[]{}; | ||
| if (rrule != null) { | ||
| result = new RecurrenceRuleProxy[] { new RecurrenceRuleProxy(rrule, calendarID, begin) }; | ||
| } | ||
| setProperty(TiC.PROPERTY_RECURRENCE_RULES, result); | ||
| } | ||
|
|
||
| @Kroll.getProperty @Kroll.method | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Personally, I'd prefer
RECURRENCE_FREQUENCY_DAILYtoRECURRENCEFREQUENCY_DAILY(same goes for the rest)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the way we currently have them for iOS:
https://docs.appcelerator.com/platform/latest/#!/api/Titanium.Calendar-property-RECURRENCEFREQUENCY_DAILY
We can change them in there too - now would be the time because that would be a breaking change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we'd want to "fix" them to match our naming conventions. We'd have to retain the existing definitions and mark them as deprecated for this release, then in 8.0 or later we can remove the ones missing the underscores. So not really a breaking change, but an important deprecation to get in before GA.