From f9c8661fe6308e795ac098f85de2407344342869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20J=2E=20Hern=C3=A1ndez=20Blasco?= Date: Wed, 25 Mar 2015 00:03:51 +0100 Subject: [PATCH] oc-mail: Use constant names in props value This gives to the developer more information about the property values for PidLidSharingFlavor and PidLidSharingCapabilities. --- OpenChange/MAPIStoreMailVolatileMessage.m | 2 +- OpenChange/MAPIStoreSharingMessage.h | 2 ++ OpenChange/MAPIStoreSharingMessage.m | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/OpenChange/MAPIStoreMailVolatileMessage.m b/OpenChange/MAPIStoreMailVolatileMessage.m index 7ef2c2c96..b5239f193 100644 --- a/OpenChange/MAPIStoreMailVolatileMessage.m +++ b/OpenChange/MAPIStoreMailVolatileMessage.m @@ -572,7 +572,7 @@ FillMessageHeadersFromSharingProperties (NGMutableHashMap *headers, NSDictionary /* 0x5100 sharing flavour is not in standard but it seems to be a denial of request + invitation message so we store deny sharing flavour */ - sharingFlavourNum = [NSNumber numberWithUnsignedInt: 0x25100]; + sharingFlavourNum = [NSNumber numberWithUnsignedInt: SHARING_DENY_REQUEST]; } [headers setObject: sharingFlavourNum forKey: @"X-MS-Sharing-Flavor"]; diff --git a/OpenChange/MAPIStoreSharingMessage.h b/OpenChange/MAPIStoreSharingMessage.h index c3ca14feb..7db7f552f 100644 --- a/OpenChange/MAPIStoreSharingMessage.h +++ b/OpenChange/MAPIStoreSharingMessage.h @@ -26,6 +26,8 @@ #import "MAPIStoreMailMessage.h" #import "MAPIStoreObjectProxy.h" +#define SHARING_SPECIAL_FOLDER 0x40290 + @interface MAPIStoreSharingMessage : MAPIStoreObjectProxy { struct mapistore_connection_info *connInfo; diff --git a/OpenChange/MAPIStoreSharingMessage.m b/OpenChange/MAPIStoreSharingMessage.m index 67a133bd8..ba0c74132 100644 --- a/OpenChange/MAPIStoreSharingMessage.m +++ b/OpenChange/MAPIStoreSharingMessage.m @@ -38,6 +38,7 @@ #import "MAPIStoreMailFolder.h" #import "MAPIStoreSharingMessage.h" +#include #include #include @@ -175,28 +176,28 @@ value = [properties objectForKey: @"x-ms-sharing-capabilities"]; if (value) { - if ([value intValue] == 0x40290) /* Special folder */ + if ([value intValue] == SHARING_SPECIAL_FOLDER) { value = [properties objectForKey: @"x-ms-sharing-responsetime"]; auxValue = [properties objectForKey: @"x-ms-sharing-remoteuid"]; if (value) /* A sharing request */ { if (auxValue) - *data = MAPILongValue (memCtx, 0x20710); + *data = MAPILongValue (memCtx, SHARING_INVITATION_REQUEST_FOLDER); else - *data = MAPILongValue (memCtx, 0x20500); + *data = MAPILongValue (memCtx, SHARING_REQUEST_SPECIAL_FOLDER); } else { if (auxValue) /* It SHOULD be an invitation or response */ - *data = MAPILongValue (memCtx, 0x20310); + *data = MAPILongValue (memCtx, SHARING_INVITATION_SPECIAL_FOLDER); else /* No remote info, then denial */ - *data = MAPILongValue (memCtx, 0x25100); + *data = MAPILongValue (memCtx, SHARING_DENY_REQUEST); } } else { - *data = MAPILongValue (memCtx, 0x310); + *data = MAPILongValue (memCtx, SHARING_INVITATION_FOLDER); } rc = MAPISTORE_SUCCESS; }