diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m
index f097c88ad..a0d74054e 100644
--- a/ActiveSync/iCalEvent+ActiveSync.m
+++ b/ActiveSync/iCalEvent+ActiveSync.m
@@ -82,7 +82,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
iCalTimeZone *tz;
id o;
- int v, i;
+ int v, i, meetingStatus;
NSTimeZone *userTimeZone;
userTimeZone = [[[context activeUser] userDefaults] timeZone];
@@ -134,6 +134,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Organizer and other invitations related properties
if ((organizer = [self organizer]))
{
+ meetingStatus = 1; // meeting and the user is the meeting organizer.
o = [organizer rfc822Email];
if ([o length])
{
@@ -144,6 +145,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[s appendFormat: @"%@", o];
}
}
+ else
+ {
+ meetingStatus = 0; // appointment
+ }
// Attendees
attendees = [self attendees];
@@ -186,18 +191,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
int attendee_status;
+ meetingStatus = 3; // event is a meeting, and the user is not the meeting organizer
+
attendee = [self userAsAttendee: [context activeUser]];
attendee_status = [self _attendeeStatus: attendee];
[s appendFormat: @"%d", 1];
[s appendFormat: @"%d", attendee_status];
- [s appendFormat: @"%d", 3];
[s appendFormat: @"%d", 1];
// BusyStatus -- http://msdn.microsoft.com/en-us/library/ee202290(v=exchg.80).aspx
[s appendFormat: @"%d", 2];
}
+ [s appendFormat: @"%d", meetingStatus];
+
// Subject -- http://msdn.microsoft.com/en-us/library/ee157192(v=exchg.80).aspx
if ([[self summary] length])
[s appendFormat: @"%@", [[self summary] activeSyncRepresentationInContext: context]];
diff --git a/NEWS b/NEWS
index 0d89058e9..c765c7e13 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,8 @@ Enhancements
Bug fixes
- Fix for privacy and categories for EAS (#3022)
-
+ - Correctly set MeetingStatus for EAS on iOS devices
+
2.2.11a (2014-12-10)
--------------------