Commit 218ea51b authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #523 in ZP/z-push from...

Merge pull request #523 in ZP/z-push from bugfix/ZP-1208-meeting-shows-up-twice-in-outlook to develop

* commit '8af3f635':
  ZP-1208 Outlook expects GlobalObjId to be base64 encoded (as specified for AS 14).
parents 88675a02 8af3f635
...@@ -636,7 +636,7 @@ class Request { ...@@ -636,7 +636,7 @@ class Request {
* Checks the device type if it expects the globalobjid in meeting requests encoded as hex. * Checks the device type if it expects the globalobjid in meeting requests encoded as hex.
* If it's not the case, globalobjid will be base64 encoded. * If it's not the case, globalobjid will be base64 encoded.
* *
* WindowsOutlook and iOS device since 9.3 (?) version expect globalobjid to be hex encoded. * iOS device since 9.3 (?) version expect globalobjid to be hex encoded.
* @see https://jira.z-hub.io/projects/ZP/issues/ZP-1013 * @see https://jira.z-hub.io/projects/ZP/issues/ZP-1013
* *
* @access public * @access public
...@@ -644,9 +644,6 @@ class Request { ...@@ -644,9 +644,6 @@ class Request {
*/ */
static public function IsGlobalObjIdHexClient() { static public function IsGlobalObjIdHexClient() {
switch (self::GetDeviceType()) { switch (self::GetDeviceType()) {
case "WindowsOutlook":
ZLog::Write(LOGLEVEL_DEBUG, "Request->IsGlobalObjIdHexClient(): WindowsOutlook");
return true;
case "iPod": case "iPod":
case "iPad": case "iPad":
case "iPhone": case "iPhone":
...@@ -658,6 +655,7 @@ class Request { ...@@ -658,6 +655,7 @@ class Request {
} }
return false; return false;
} }
/**---------------------------------------------------------------------------------------------------------- /**----------------------------------------------------------------------------------------------------------
* Private stuff * Private stuff
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment