Projects
Kolab:16:Testing
kolab-syncroton
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 31
View file
kolab-syncroton.spec
Changed
@@ -37,7 +37,7 @@ %global upstream_version 2.4.2 Name: kolab-syncroton -Version: 2.4.2.7 +Version: 2.4.2.8 Release: 1%{?dist} Summary: ActiveSync for Kolab Groupware
View file
debian.changelog
Changed
@@ -1,4 +1,4 @@ -kolab-syncroton (2.4.2.7-0~kolab1) unstable; urgency=low +kolab-syncroton (2.4.2.8-0~kolab1) unstable; urgency=low * Release version 2.4.2
View file
kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_calendar.php
Changed
@@ -185,6 +185,7 @@ $config = $this->getFolderConfig($event'_mailbox'); $result = array(); $is_outlook = stripos($this->device->devicetype, 'outlook') !== false; + $is_android = stripos($this->device->devicetype, 'android') !== false; // Kolab Format 3.0 and xCal does support timezone per-date, but ActiveSync allows // only one timezone per-event. We'll use timezone of the start date @@ -317,7 +318,7 @@ $resp_type = $status ?: self::ATTENDEE_STATUS_UNKNOWN; // Synchronize the attendee status to the event status to get the same behaviour as outlook. - if ($is_outlook && isset($attendee'status')) { + if (($is_outlook || $is_android )&& isset($attendee'status')) { if ($attendee'status' == 'ACCEPTED') { $result'busyStatus' = self::BUSY_STATUS_BUSY; } @@ -388,6 +389,7 @@ $is_exception = $data instanceof Syncroton_Model_EventException; $dummy_tz = str_repeat('A', 230) . '=='; $is_outlook = stripos($this->device->devicetype, 'outlook') !== false; + $is_android = stripos($this->device->devicetype, 'android') !== false; // check data validity $this->check_event($data); @@ -462,7 +464,7 @@ case 'free_busy': // Outlook sets the busy state to the attendance state, and we don't want to change the event state based on that. // Outlook doesn't have the concept of an event state, so we just ignore this. - if ($is_outlook) { + if ($is_outlook || $is_android) { continue 2; } $map = array_flip($this->busyStatusMap); @@ -573,7 +575,7 @@ } // Outlook does not send the correct attendee status when changing between accepted and tentative, but it toggles the busyStatus. - if ($is_outlook) { + if ($is_outlook || $is_android) { $status = null; if ($data->busyStatus == self::BUSY_STATUS_BUSY) { $status = "ACCEPTED";
View file
kolab-syncroton.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-syncroton Binary: kolab-syncroton Architecture: all -Version: 1:2.4.2.7-1~kolab1 +Version: 1:2.4.2.8-1~kolab1 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://www.kolab.org/
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.