added struct, enum and modified struct, enum

resource of noti. service support to mandatory field and optional field.
so, added optional field of struct and enum.
and then modified rename the field.

Change-Id: I45dc1d5763496e1c74225fae9ad71c95be2c2f9b
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index 8dbaf5c..75397e0 100644 (file)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -127,8 +127,8 @@ notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\
        'service/notification', 'NSConsumerInterface.h')
 
 # Go to build Unit test
-if target_os == 'linux':
-       SConscript('unittest/SConscript')
+# if target_os == 'linux':
+#      SConscript('unittest/SConscript')
 
 # Go to build sample apps
 SConscript('examples/SConscript')

diff --git a/service/notification/android/notification-service/src/main/jni/notificationProvider.c b/service/notification/android/notification-service/src/main/jni/notificationProvider.c
index 1439d7a..d8549eb 100644 (file)
--- a/service/notification/android/notification-service/src/main/jni/notificationProvider.c
+++ b/service/notification/android/notification-service/src/main/jni/notificationProvider.c
@@ -53,7 +53,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_notification_IoTNotification_NS
     g_obj_syncListener = (jobject) (*env)->NewGlobalRef(env, jSyncListener);\r
 \r
     // check access policy\r
-    NSAccessPolicy access = NS_ACCEPTER_PROVIDER;\r
+    NSAccessPolicy access = NS_ACCESS_ALLOW;\r
 \r
     if (NSStartProvider(access, NSSubscribeRequestCb, NSSyncCb) != NS_OK)\r
     {\r
@@ -176,7 +176,7 @@ void NSSubscribeRequestCb(NSConsumer *consumer)
     return;\r
 }\r
 \r
-void NSSyncCb(NSSync *sync)\r
+void NSSyncCb(NSSyncInfo *sync)\r
 {\r
     LOGI("Sync requested");\r
 \r
@@ -203,10 +203,10 @@ void NSSyncCb(NSSync *sync)
         }\r
     }\r
 \r
-    LOGI("Sync ID : %s\n", sync->mMessageId);\r
-    LOGI("Sync STATE : %d\n", sync->mState);\r
+    LOGI("Sync ID : %s\n", sync->messageId);\r
+    LOGI("Sync STATE : %d\n", sync->state);\r
 \r
-    jstring strMessageId = (*env)->NewStringUTF(env, sync->mMessageId);\r
+    jstring strMessageId = (*env)->NewStringUTF(env, sync->messageId);\r
 \r
     jclass cls = (*env)->GetObjectClass(env, g_obj_syncListener);\r
     if (!cls)\r
@@ -222,7 +222,7 @@ void NSSyncCb(NSSync *sync)
         return;\r
     }\r
 \r
-    (*env)->CallVoidMethod(env, g_obj_syncListener, mid, strMessageId, (jint) sync->mState);\r
+    (*env)->CallVoidMethod(env, g_obj_syncListener, mid, strMessageId, (jint) sync->state);\r
 \r
     (*g_jvm)->DetachCurrentThread(g_jvm);\r
 \r
@@ -302,10 +302,10 @@ NSMessage * NSGetMessage(JNIEnv * env, jobject jMsg)
 \r
     NSMessage * nsMsg = (NSMessage *) malloc(sizeof(NSMessage));\r
 \r
-    nsMsg->mId = strdup(messageId);\r
-    nsMsg->mTitle = strdup(messageTitle);\r
-    nsMsg->mContentText = strdup(messageBody);\r
-    nsMsg->mSource = strdup(messageSource);\r
+    nsMsg->messageId = strdup(messageId);\r
+    nsMsg->title = strdup(messageTitle);\r
+    nsMsg->contentText = strdup(messageBody);\r
+    nsMsg->sourceName = strdup(messageSource);\r
 \r
     return nsMsg;\r
 \r

diff --git a/service/notification/android/notification-service/src/main/jni/notificationProvider.h b/service/notification/android/notification-service/src/main/jni/notificationProvider.h
index 63827fd..ffafb5c 100644 (file)
--- a/service/notification/android/notification-service/src/main/jni/notificationProvider.h
+++ b/service/notification/android/notification-service/src/main/jni/notificationProvider.h
@@ -46,7 +46,7 @@ extern "C"
 \r
     void NSSubscribeRequestCb(NSConsumer*);\r
 \r
-    void NSSyncCb(NSSync*);\r
+    void NSSyncCb(NSSyncInfo*);\r
 \r
     NSMessage * NSGetMessage(JNIEnv *, jobject);\r
 \r

diff --git a/service/notification/examples/linux/notificationconsumer.c b/service/notification/examples/linux/notificationconsumer.c
index 328bfbe..778f428 100644 (file)
--- a/service/notification/examples/linux/notificationconsumer.c
+++ b/service/notification/examples/linux/notificationconsumer.c
@@ -9,10 +9,10 @@ void onNotificationPosted(NSProvider * provider, NSMessage * notification)
 {
     printf("Notification from : %s:%d\n", ((OCDevAddr *)provider->mUserData)->addr,
             ((OCDevAddr *)provider->mUserData)->port);
-    printf("id : %s\n", notification->mId);
-    printf("title : %s\n", notification->mTitle);
-    printf("content : %s\n", notification->mContentText);
-    printf("source : %s\n", notification->mSource);
+    printf("id : %s\n", notification->messageId);
+    printf("title : %s\n", notification->title);
+    printf("content : %s\n", notification->contentText);
+    printf("source : %s\n", notification->sourceName);
 //    NSDropNSObject(notification);
     NSConsumerReadCheck(notification);
 }
@@ -24,12 +24,12 @@ void onDiscoverNotification(NSProvider * provider)
     printf("startSubscribing\n");
 }
 
-void onNotificationSync(NSProvider * provider, NSSync * sync)
+void onNotificationSync(NSProvider * provider, NSSyncInfo * sync)
 {
     printf("Sync from : %s:%d\n", ((OCDevAddr *)provider->mUserData)->addr,
             ((OCDevAddr *)provider->mUserData)->port);
-    printf("Sync ID : %s\n", sync->mMessageId);
-    printf("Sync STATE : %d\n", sync->mState);
+    printf("Sync ID : %s\n", sync->messageId);
+    printf("Sync STATE : %d\n", sync->state);
 }
 
 int main(void)

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index 7a9bbd2..b9c71e4 100644 (file)
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -62,11 +62,11 @@ void subscribeRequestCallback(NSConsumer *consumer)
     NSAccept(consumer, true);\r
 }\r
 \r
-void syncCallback(NSSync *sync)\r
+void syncCallback(NSSyncInfo *sync)\r
 {\r
     OIC_LOG(INFO, TAG, "sync requested");\r
 \r
-    printf("NS_APP Sync State: %d\n", sync->mState);\r
+    printf("NS_APP Sync State: %d\n", sync->state);\r
 }\r
 \r
 int main()\r
@@ -109,18 +109,17 @@ int main()
         {\r
             case 1:\r
                 OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Provider)");\r
-                NSStartProvider(NS_ACCEPTER_PROVIDER, subscribeRequestCallback, syncCallback);\r
+                NSStartProvider(NS_ACCESS_ALLOW, subscribeRequestCallback, syncCallback);\r
                 break;\r
             case 2:\r
                 OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Consumer)");\r
-                NSStartProvider(NS_ACCEPTER_CONSUMER, subscribeRequestCallback, syncCallback);\r
+                NSStartProvider(NS_ACCESS_DENY, subscribeRequestCallback, syncCallback);\r
                 break;\r
             case 3:\r
                 OIC_LOG(INFO, TAG, "NSSendNotification()");\r
 \r
                 char title[100];\r
                 char body[100];\r
-                char charID[100];\r
 \r
                 printf("id : %d\n", ++id);\r
                 printf("title : ");\r
@@ -130,18 +129,14 @@ int main()
                 printf("body : ");\r
                 gets(body);\r
 \r
-                printf("app - mId : %s \n", charID);\r
                 printf("app - mTitle : %s \n", title);\r
                 printf("app - mContentText : %s \n", body);\r
 \r
                 NSMessage * msg = (NSMessage *)OICMalloc(sizeof(NSMessage));\r
 \r
-                sprintf(charID, "%d", id);\r
-\r
-                msg->mId = strdup(charID);\r
-                msg->mTitle = strdup(title);\r
-                msg->mContentText = OICStrdup(body);\r
-                msg->mSource = OICStrdup("OCF");\r
+                msg->title = strdup(title);\r
+                msg->contentText = OICStrdup(body);\r
+                msg->sourceName = OICStrdup("OCF");\r
 \r
                 NSSendMessage(msg);\r
 \r
@@ -149,10 +144,10 @@ int main()
 \r
             case 4:\r
                 OIC_LOG(INFO, TAG, "NSRead");\r
-                NSSync * sync = (NSSync*) OICMalloc(sizeof(NSSync));\r
+                NSSyncInfo * sync = (NSSyncInfo*) OICMalloc(sizeof(NSSyncInfo));\r
 \r
-                sync->mMessageId = OICStrdup("dev_001");\r
-                sync->mState = 1;\r
+                sync->messageId = OICStrdup("dev_001");\r
+                sync->state = 1;\r
 \r
                 break;\r
 \r

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index 56c9121..33139c4 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -33,7 +33,8 @@
 #define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
 #define NS_ATTRIBUTE_SYNC "SYNC_URI"
 #define NS_ATTRIBUTE_ACCPETANCE "ACCEPTANCE"
-#define NS_ATTRIBUTE_ID "ID"
+#define NS_ATTRIBUTE_MESSAGE_ID "MESSAGE_ID"
+#define NS_ATTRIBUTE_PROVIDER_ID "PROVIDER_ID"
 #define NS_ATTRIBUTE_TITLE "TITLE"
 #define NS_ATTRIBUTE_TEXT "CONTENTTEXT"
 #define NS_ATTRIBUTE_SOURCE "SOURCE"
@@ -61,9 +62,6 @@ typedef enum eAccessPolicy
 {
     NS_ACCESS_ALLOW = 0,
     NS_ACCESS_DENY = 1,
-    NS_ACCEPTER_PROVIDER = 0,
-    NS_ACCEPTER_CONSUMER = 1,
-
 } NSAccessPolicy;
 
 /**
@@ -71,11 +69,26 @@ typedef enum eAccessPolicy
  */
 typedef enum
 {
-    Notification_Read = 0,
-    Notification_Dismiss = 1,
-    Notification_Unread = 2,
+    NS_SYNC_UNREAD = 0,
+    NS_SYNC_READ = 1,
+    NS_SYNC_DELETED = 2,
+} NSSyncType;
 
-} NSSyncTypes;
+/**
+ * Notification Message Type
+ * Alert mean is High / critical
+ * Notice mean is low / critical
+ * Event mean is High / Normal
+ * Information mean is Low / Normal
+ */
+typedef enum
+{
+    NS_MESSAGE_ALERT = 0,
+    NS_MESSAGE_NOTICE = 1,
+    NS_MESSAGE_EVENT = 2,
+    NS_MESSAGE_INFO = 3,
+
+} NSMessageType;
 
 /**
  *  Consumer information
@@ -102,14 +115,31 @@ typedef struct
 } NSProvider;
 
 /**
+ *  Media Contents of Notification Message (Optional)
+ */
+typedef struct
+{
+    char * iconImage;
+
+} NSMediaContents;
+
+/**
  *  Notification Message
  */
 typedef struct
 {
-    char * mId;
-    char * mTitle;
-    char * mContentText;
-    char * mSource;
+    //Mandatory
+    uint64_t messageId;
+    char * providerId;
+
+    //optional
+    NSMessageType type;
+    char * dateTime;
+    uint64_t ttl;
+    char * title;
+    char * contentText;
+    char * sourceName;
+    NSMediaContents mediaContents;
 
 } NSMessage;
 
@@ -118,12 +148,11 @@ typedef struct
  */
 typedef struct
 {
-    // Mandatory
-    char * mMessageId;
-    char * mSourceId; // TO-DO from whom
-    NSSyncTypes mState;
+    uint64_t messageId;
+    char * providerId;
+    NSSyncType state;
 
-} NSSync;
+} NSSyncInfo;
 
 #endif /* _NS_COMMON_H_ */
 

diff --git a/service/notification/include/NSConsumerInterface.h b/service/notification/include/NSConsumerInterface.h
index 9461cc5..0353e95 100644 (file)
--- a/service/notification/include/NSConsumerInterface.h
+++ b/service/notification/include/NSConsumerInterface.h
@@ -40,7 +40,7 @@ extern "C"
  * @param[in] provider    Provider who requests synchronization with the status
  * @param[in] sync        Synchronization information of the notification message
  */
-typedef void (*NSSyncCallback)(NSProvider *, NSSync *);
+typedef void (*NSSyncCallback)(NSProvider *, NSSyncInfo *);
 
 /**
  * Consumer uses this callback function to receive the discovered providers

diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProviderInterface.h
index b4ea0d7..de91a9d 100644 (file)
--- a/service/notification/include/NSProviderInterface.h
+++ b/service/notification/include/NSProviderInterface.h
@@ -47,7 +47,7 @@ typedef void (*NSSubscribeRequestCallback)(NSConsumer *);
  * synchronization\r
  * @param[in] sync        Synchronization information of the notification message\r
  */\r
-typedef void (*NSSyncCallback)(NSSync *);\r
+typedef void (*NSSyncCallback)(NSSyncInfo *);\r
 \r
 /**\r
  * Initialize notification service for provider\r

diff --git a/service/notification/src/common/NSUtil.c b/service/notification/src/common/NSUtil.c
index a5eeea2..ac9205a 100755 (executable)
--- a/service/notification/src/common/NSUtil.c
+++ b/service/notification/src/common/NSUtil.c
@@ -89,28 +89,28 @@ NSResult NSFreeMessage(NSMessage * obj)
         return NS_ERROR;
     }
 
-    if (obj->mId)
+    if (obj->messageId)
     {
-        OICFree(obj->mId);
-        obj->mId = NULL;
+        OICFree(obj->messageId);
+        obj->messageId = NULL;
     }
 
-    if (obj->mTitle)
+    if (obj->title)
     {
-        OICFree(obj->mTitle);
-        obj->mTitle = NULL;
+        OICFree(obj->title);
+        obj->title = NULL;
     }
 
-    if (obj->mContentText)
+    if (obj->contentText)
     {
-        OICFree(obj->mContentText);
-        obj->mContentText = NULL;
+        OICFree(obj->contentText);
+        obj->contentText = NULL;
     }
 
-    if (obj->mSource)
+    if (obj->sourceName)
     {
-        OICFree(obj->mSource);
-        obj->mSource = NULL;
+        OICFree(obj->sourceName);
+        obj->sourceName = NULL;
     }
 
     OICFree(obj);
@@ -129,52 +129,52 @@ NSMessage * NSDuplicateMessage(NSMessage * copyMsg)
     }
 
     newMsg = (NSMessage *)OICMalloc(sizeof(NSMessage));
-    newMsg->mContentText = NULL;
-    newMsg->mId = NULL;
-    newMsg->mSource = NULL;
-    newMsg->mTitle = NULL;
+    newMsg->contentText = NULL;
+    newMsg->messageId = NULL;
+    newMsg->sourceName = NULL;
+    newMsg->title = NULL;
 
-    if (copyMsg->mId)
+    if (copyMsg->messageId)
     {
-        newMsg->mId = OICStrdup(copyMsg->mId);
+        newMsg->messageId = OICStrdup(copyMsg->messageId);
     }
 
-    if (copyMsg->mTitle)
+    if (copyMsg->title)
     {
-        newMsg->mTitle = OICStrdup(copyMsg->mTitle);
+        newMsg->title = OICStrdup(copyMsg->title);
     }
 
-    if (copyMsg->mContentText)
+    if (copyMsg->contentText)
     {
-        newMsg->mContentText = OICStrdup(copyMsg->mContentText);
+        newMsg->contentText = OICStrdup(copyMsg->contentText);
     }
 
-    if (copyMsg->mSource)
+    if (copyMsg->sourceName)
     {
-       newMsg->mSource = OICStrdup(copyMsg->mSource);
+       newMsg->sourceName = OICStrdup(copyMsg->sourceName);
     }
 
     return newMsg;
 }
 
-NSResult NSFreeSync(NSSync * obj)
+NSResult NSFreeSync(NSSyncInfo * obj)
 {
     if (!obj)
     {
         return NS_ERROR;
     }
 
-    if (obj->mMessageId)
+    if (obj->messageId)
     {
-        OICFree(obj->mMessageId);
-        obj->mMessageId = NULL;
+        OICFree(obj->messageId);
+        obj->messageId = NULL;
     }
 
-    if (obj->mSourceId)
+    if (obj->providerId)
     {
-        NS_LOG_V(DEBUG, "obj->mSourceid = %s", obj->mSourceId);
-        OICFree(obj->mSourceId);
-        obj->mSourceId = NULL;
+        NS_LOG_V(DEBUG, "obj->mSourceid = %s", obj->providerId);
+        OICFree(obj->providerId);
+        obj->providerId = NULL;
     }
 
     OICFree(obj);
@@ -182,9 +182,9 @@ NSResult NSFreeSync(NSSync * obj)
     return NS_OK;
 }
 
-NSSync* NSDuplicateSync(NSSync * copyMsg)
+NSSyncInfo* NSDuplicateSync(NSSyncInfo * copyMsg)
 {
-    NSSync * newMsg = NULL;
+    NSSyncInfo * newMsg = NULL;
 
     if(copyMsg == NULL)
     {
@@ -192,22 +192,22 @@ NSSync* NSDuplicateSync(NSSync * copyMsg)
         return NULL;
     }
 
-    newMsg = (NSSync *)OICMalloc(sizeof(NSSync));
-    newMsg->mMessageId = NULL;
-    newMsg->mSourceId = NULL;
-    newMsg->mState = -1;
+    newMsg = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
+    newMsg->messageId = NULL;
+    newMsg->providerId = NULL;
+    newMsg->state = -1;
 
-    if (copyMsg->mMessageId)
+    if (copyMsg->messageId)
     {
-        newMsg->mMessageId = OICStrdup(copyMsg->mMessageId);
+        newMsg->messageId = OICStrdup(copyMsg->messageId);
     }
 
-    if (copyMsg->mSourceId)
+    if (copyMsg->providerId)
     {
-        newMsg->mSourceId = OICStrdup(copyMsg->mSourceId);
+        newMsg->providerId = OICStrdup(copyMsg->providerId);
     }
 
-    newMsg->mState = copyMsg->mState;
+    newMsg->state = copyMsg->state;
 
     return newMsg;
 }
@@ -277,7 +277,7 @@ void NSDuplicateSetPropertyString(OCRepPayload** msgPayload, const char * name,
 }
 
 
-NSSync * NSGetSyncInfo(OCPayload * payload)
+NSSyncInfo * NSGetSyncInfo(OCPayload * payload)
 {
     NS_LOG(DEBUG, "NSBuildOICNotificationSync - IN");
 
@@ -285,38 +285,38 @@ NSSync * NSGetSyncInfo(OCPayload * payload)
     {
         return NULL;
     }
-    NSSync * retSync = (NSSync *)OICMalloc(sizeof(NSSync));
+    NSSyncInfo * retSync = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
     if (!retSync)
     {
         return NULL;
     }
 
-    retSync->mMessageId = NULL;
-    retSync->mState = Notification_Read;
+    retSync->messageId = NULL;
+    retSync->state = NS_SYNC_READ;
 
     OCRepPayload * repPayload = (OCRepPayload *)payload;
-    if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_ID, &retSync->mMessageId))
+    if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_MESSAGE_ID, &retSync->messageId))
     {
         OICFree(retSync);
         return NULL;
     }
-    if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_SOURCE, &retSync->mSourceId))
+    if (!OCRepPayloadGetPropString(repPayload, NS_ATTRIBUTE_PROVIDER_ID, &retSync->providerId))
     {
         OICFree(retSync);
         return NULL;
     }
     int64_t state;
-    if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_STATE, & state))
+    if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_STATE, &state))
     {
-        OICFree(retSync->mMessageId);
+        OICFree(retSync->messageId);
         OICFree(retSync);
         return NULL;
     }
 
-    retSync->mState = (NSSyncTypes) state;
+    retSync->state = (NSSyncType) state;
 
-    NS_LOG_V(DEBUG, "Sync ID : %s", retSync->mMessageId);
-    NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->mState);
+    NS_LOG_V(DEBUG, "Sync ID : %s", retSync->messageId);
+    NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state);
 
     NS_LOG(DEBUG, "NSBuildOICNotificationSync - OUT");
 

diff --git a/service/notification/src/common/NSUtil.h b/service/notification/src/common/NSUtil.h
index 5d59cf8..abab2b6 100755 (executable)
--- a/service/notification/src/common/NSUtil.h
+++ b/service/notification/src/common/NSUtil.h
@@ -38,9 +38,9 @@ NSResult NSFreeOCEntityHandlerRequest(OCEntityHandlerRequest *);
 NSResult NSFreeMessage(NSMessage *);\r
 NSMessage * NSDuplicateMessage(NSMessage *);\r
 \r
-NSResult NSFreeSync(NSSync *);\r
-NSSync * NSDuplicateSync(NSSync *);\r
-NSSync * NSGetSyncInfo(OCPayload * payload);\r
+NSResult NSFreeSync(NSSyncInfo *);\r
+NSSyncInfo * NSDuplicateSync(NSSyncInfo *);\r
+NSSyncInfo * NSGetSyncInfo(OCPayload * payload);\r
 \r
 NSResult NSFreeConsumer(NSConsumer *);\r
 NSConsumer * NSDuplicateConsumer(NSConsumer *);\r

diff --git a/service/notification/src/consumer/NSConsumerCommon.c b/service/notification/src/consumer/NSConsumerCommon.c
index f5108f0..7581989 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommon.c
+++ b/service/notification/src/consumer/NSConsumerCommon.c
@@ -86,18 +86,18 @@ void NSSetNotificationSyncCb(NSSyncCallback cb)
 typedef struct
 {
     NSProvider * provider;
-    NSSync * sync;
+    NSSyncInfo * sync;
 } NSSyncData;
 
 void * NSNotificationSyncFunc(void * obj)
 {
     NSProvider * provider = ((NSSyncData *) obj)->provider;
-    NSSync * syncData = ((NSSyncData *) obj)->sync;
+    NSSyncInfo * syncData = ((NSSyncData *) obj)->sync;
     (* NSGetBoneNotificationSyncCb())(provider, syncData);
     return NULL;
 }
 
-void NSNotificationSync(NSProvider * provider, NSSync * sync)
+void NSNotificationSync(NSProvider * provider, NSSyncInfo * sync)
 {
     NSSyncData * obj = (NSSyncData *)OICMalloc(sizeof(NSSyncData));
     NS_VERTIFY_NOT_NULL_V(obj);

diff --git a/service/notification/src/consumer/NSConsumerCommon.h b/service/notification/src/consumer/NSConsumerCommon.h
index fd74633..350c704 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommon.h
+++ b/service/notification/src/consumer/NSConsumerCommon.h
@@ -117,7 +117,7 @@ void NSSetNotificationPostedCb(NSNotificationReceivedCallback  cb);
 void NSNotificationPost(NSProvider * provider, NSMessage * obj);
 
 void NSSetNotificationSyncCb(NSSyncCallback cb);
-void NSNotificationSync(NSProvider * provider, NSSync * sync);
+void NSNotificationSync(NSProvider * provider, NSSyncInfo * sync);
 
 NSTask * NSMakeTask(NSTaskType, void *);
 

diff --git a/service/notification/src/consumer/NSConsumerCommunication.c b/service/notification/src/consumer/NSConsumerCommunication.c
index 661b329..7e76b65 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommunication.c
+++ b/service/notification/src/consumer/NSConsumerCommunication.c
@@ -28,7 +28,7 @@
 const char NS_MESSAGE_ACCEPTANCE[] = "0000-0000-0000-0000";
 
 NSMessage_consumer * NSGetNSMessage(OCClientResponse * clientResponse);
-NSSync * NSGetNSSyncInfo(OCClientResponse * clientResponse);
+NSSyncInfo * NSGetNSSyncInfo(OCClientResponse * clientResponse);
 NSProvider * NSGetNSProvider(OCClientResponse * clientResponse);
 OCRepPayload * NSGetPayloadofSyncInfo(NSMessage_consumer * message, int type);
 
@@ -82,7 +82,7 @@ OCStackApplicationResult NSConsumerSyncInfoListener(
     NS_VERTIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
     NS_VERTIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
 
-    NSSync * newNoti = NULL;
+    NSSyncInfo * newNoti = NULL;
 
     NS_LOG(ERROR, "get provider");
     NSProvider * provider = NSGetNSProvider(clientResponse);
@@ -93,7 +93,7 @@ OCStackApplicationResult NSConsumerSyncInfoListener(
 
     NSTaskType taskType = TASK_RECV_READ;
 
-    if (newNoti->mState != Notification_Read)
+    if (newNoti->state != NS_SYNC_READ)
     {
         NS_LOG(DEBUG, "newNoti->type : Dismiss");
         taskType = TASK_RECV_DISMISS;
@@ -170,7 +170,7 @@ NSMessage_consumer * NSGetNSMessage(OCClientResponse * clientResponse)
     NS_LOG(DEBUG, "get id");
     OCRepPayload * payload = (OCRepPayload *)clientResponse->payload;
     char * id = NULL;
-    bool getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_ID, &id);
+    bool getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_MESSAGE_ID, &id);
     NS_VERTIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
 
     NS_LOG(DEBUG, "create NSMessage");
@@ -202,7 +202,7 @@ NSMessage_consumer * NSGetNSMessage(OCClientResponse * clientResponse)
     return retNoti;
 }
 
-NSSync * NSGetNSSyncInfo(OCClientResponse * clientResponse)
+NSSyncInfo * NSGetNSSyncInfo(OCClientResponse * clientResponse)
 {
     NS_VERTIFY_NOT_NULL(clientResponse->payload, NULL);
 
@@ -215,18 +215,18 @@ NSSync * NSGetNSSyncInfo(OCClientResponse * clientResponse)
 
     NS_LOG(DEBUG, "get id");
     char * id = NULL;
-    getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_ID, &id);
+    getResult = OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_MESSAGE_ID, &id);
     NS_VERTIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
 
     NS_LOG(DEBUG, "create NSSyncInfo");
-    NSSync * retSync = (NSSync *)OICMalloc(sizeof(NSSync));
+    NSSyncInfo * retSync = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
     NS_VERTIFY_NOT_NULL(retSync, NULL);
 
-    retSync->mMessageId = id;
-    retSync->mState = (NSSyncTypes) state;
+    retSync->messageId = id;
+    retSync->state = (NSSyncType) state;
 
-    NS_LOG_V(DEBUG, "Sync ID : %s", retSync->mMessageId);
-    NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->mState);
+    NS_LOG_V(DEBUG, "Sync ID : %s", retSync->messageId);
+    NS_LOG_V(DEBUG, "Sync State : %d", (int) retSync->state);
 
     return retSync;
 }

diff --git a/service/notification/src/consumer/NSConsumerDiscovery.c b/service/notification/src/consumer/NSConsumerDiscovery.c
index 324454e..f8ce820 100644 (file)
--- a/service/notification/src/consumer/NSConsumerDiscovery.c
+++ b/service/notification/src/consumer/NSConsumerDiscovery.c
@@ -177,7 +177,7 @@ OCStackApplicationResult NSIntrospectProvider(
                    OC_STACK_KEEP_TRANSACTION, OICFree(newProvider));
     memcpy(newProvider->mUserData, clientResponse->addr, sizeof(OCDevAddr));
 
-    if (accepter == NS_ACCEPTER_CONSUMER)
+    if (accepter == NS_ACCESS_DENY)
     {
         NS_LOG(DEBUG, "accepter is NS_ACCEPTER_CONSUMER, Callback to user");
 

diff --git a/service/notification/src/consumer/NSConsumerInterface.c b/service/notification/src/consumer/NSConsumerInterface.c
index 16d2e67..eba3c94 100644 (file)
--- a/service/notification/src/consumer/NSConsumerInterface.c
+++ b/service/notification/src/consumer/NSConsumerInterface.c
@@ -110,28 +110,28 @@ NSResult NSDropNSObject(NSMessage * obj)
 {
     NS_VERTIFY_NOT_NULL(obj, NS_ERROR);
 
-    if (obj->mId)
+    if (obj->messageId)
     {
-        OICFree(obj->mId);
-        obj->mId = NULL;
+        OICFree(obj->messageId);
+        obj->messageId = NULL;
     }
 
-    if (obj->mTitle)
+    if (obj->title)
     {
-        OICFree(obj->mTitle);
-        obj->mTitle = NULL;
+        OICFree(obj->title);
+        obj->title = NULL;
     }
 
-    if (obj->mContentText)
+    if (obj->contentText)
     {
-        OICFree(obj->mContentText);
-        obj->mContentText = NULL;
+        OICFree(obj->contentText);
+        obj->contentText = NULL;
     }
 
-    if (obj->mSource)
+    if (obj->sourceName)
     {
-        OICFree(obj->mSource);
-        obj->mSource = NULL;
+        OICFree(obj->sourceName);
+        obj->sourceName = NULL;
     }
 
     OICFree(obj);

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index ccf4747..fb61d6d 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -62,7 +62,7 @@ void NSSubscribeRequestCb(NSConsumer *consumer)
     NS_LOG(DEBUG, "NSSubscribeRequestCb - OUT");\r
 }\r
 \r
-void NSSyncCb(NSSync *sync)\r
+void NSSyncCb(NSSyncInfo *sync)\r
 {\r
     NS_LOG(DEBUG, "NSSyncCb - IN");\r
     g_syncCb(sync);\r
@@ -234,7 +234,7 @@ void * NSInterfaceSchedule(void * ptr)
                 case TASK_CB_SYNC:\r
                 {\r
                     NS_LOG(DEBUG, "CASE TASK_CB_SYNC : ");\r
-                    NSSync * sync = (NSSync*)node->taskData;\r
+                    NSSyncInfo * sync = (NSSyncInfo*)node->taskData;\r
                     NSSyncCb(NSDuplicateSync(sync));\r
                     NSFreeSync(sync);\r
                     break;\r

diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c
index 902b6d4..3af6f28 100644 (file)
--- a/service/notification/src/provider/NSProviderNotification.c
+++ b/service/notification/src/provider/NSProviderNotification.c
@@ -45,16 +45,16 @@ NSResult NSSetMessagePayload(NSMessage *msg, OCRepPayload** msgPayload)
 
     OCRepPayloadSetUri(*msgPayload, NS_COLLECTION_MESSAGE_URI);
 
-    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_ID, msg->mId);
-    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TITLE, msg->mTitle);
-    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TEXT, msg->mContentText);
-    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_SOURCE, msg->mSource);
+    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_MESSAGE_ID, msg->messageId);
+    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TITLE, msg->title);
+    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_TEXT, msg->contentText);
+    NSDuplicateSetPropertyString(msgPayload, NS_ATTRIBUTE_SOURCE, msg->sourceName);
 
     NS_LOG(DEBUG, "NSSetMessagePayload - OUT");
     return NS_OK;
 }
 
-NSResult NSSetSyncPayload(NSSync *sync, OCRepPayload** syncPayload)
+NSResult NSSetSyncPayload(NSSyncInfo *sync, OCRepPayload** syncPayload)
 {
     NS_LOG(DEBUG, "NSSetSyncPayload - IN");
 
@@ -68,10 +68,10 @@ NSResult NSSetSyncPayload(NSSync *sync, OCRepPayload** syncPayload)
 
     OCRepPayloadSetUri(*syncPayload, NS_COLLECTION_SYNC_URI);
 
-    NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_ID, sync->mMessageId);
-    NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_SOURCE, sync->mSourceId);
+    NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_MESSAGE_ID, sync->messageId);
+    NSDuplicateSetPropertyString(syncPayload, NS_ATTRIBUTE_PROVIDER_ID, sync->providerId);
 
-    OCRepPayloadSetPropInt(*syncPayload, NS_ATTRIBUTE_STATE, sync->mState);
+    OCRepPayloadSetPropInt(*syncPayload, NS_ATTRIBUTE_STATE, sync->state);
 
     NS_LOG(DEBUG, "NSSetSyncPayload - OUT");
     return NS_OK;
@@ -150,7 +150,7 @@ NSResult NSSendNotification(NSMessage *msg)
     return NS_OK;
 }
 
-NSResult NSSendSync(NSSync *sync)
+NSResult NSSendSync(NSSyncInfo *sync)
 {
     NS_LOG(DEBUG, "NSSendSync - IN");
 
@@ -237,12 +237,12 @@ void * NSNotificationSchedule(void *ptr)
                 }
                 case TASK_SEND_READ:
                     NS_LOG(DEBUG, "CASE TASK_SEND_READ : ");
-                    NSSendSync((NSSync*) node->taskData);
-                    NSFreeSync((NSSync*) node->taskData);
+                    NSSendSync((NSSyncInfo*) node->taskData);
+                    NSFreeSync((NSSyncInfo*) node->taskData);
                     break;
                 case TASK_RECV_READ:
                     NS_LOG(DEBUG, "CASE TASK_RECV_READ : ");
-                    NSSendSync((NSSync*) node->taskData);
+                    NSSendSync((NSSyncInfo*) node->taskData);
                     NSPushQueue(INTERFACE_SCHEDULER, TASK_CB_SYNC, node->taskData);
                     break;
 

diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c
index 1e7a94b..84801a6 100644 (file)
--- a/service/notification/src/provider/NSProviderResource.c
+++ b/service/notification/src/provider/NSProviderResource.c
@@ -161,9 +161,9 @@ NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle)
     {
         NS_LOG(DEBUG, "NSMessage is valid");
 
-        NotificationMessageResource.id = OICStrdup(msg->mId);
-        NotificationMessageResource.title = OICStrdup(msg->mTitle);
-        NotificationMessageResource.body = OICStrdup(msg->mContentText);
+        NotificationMessageResource.id = OICStrdup(msg->messageId);
+        NotificationMessageResource.title = OICStrdup(msg->title);
+        NotificationMessageResource.body = OICStrdup(msg->contentText);
     }
     else
     {
@@ -176,7 +176,7 @@ NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle)
     return NS_OK;
 }
 
-NSResult NSPutSyncResource(NSSync *sync, OCResourceHandle * handle)
+NSResult NSPutSyncResource(NSSyncInfo *sync, OCResourceHandle * handle)
 {
     NS_LOG(DEBUG, "NSPutSyncResource - IN");
 

diff --git a/service/notification/src/provider/NSProviderResource.h b/service/notification/src/provider/NSProviderResource.h
index 0dea4ea..2290beb 100644 (file)
--- a/service/notification/src/provider/NSProviderResource.h
+++ b/service/notification/src/provider/NSProviderResource.h
@@ -38,7 +38,7 @@ NSResult NSPutNotificationResource(int accepter, OCResourceHandle * handle);
 
 NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle);
 
-NSResult NSPutSyncResource(NSSync *sync, OCResourceHandle * handle);
+NSResult NSPutSyncResource(NSSyncInfo *sync, OCResourceHandle * handle);
 
 const char* NSGetNotificationMessageUri();
 

diff --git a/service/notification/src/provider/NSProviderScheduler.c b/service/notification/src/provider/NSProviderScheduler.c
index 820f9b2..072866c 100755 (executable)
--- a/service/notification/src/provider/NSProviderScheduler.c
+++ b/service/notification/src/provider/NSProviderScheduler.c
@@ -194,7 +194,7 @@ void NSFreeData(NSSchedulerType type, NSTask * task)
                 break;\r
             case TASK_CB_SYNC:\r
                 NS_LOG(DEBUG, "CASE TASK_CB_SYNC : Free");\r
-                NSFreeSync((NSSync*) task->taskData);\r
+                NSFreeSync((NSSyncInfo*) task->taskData);\r
                 break;\r
             default:\r
                 NS_LOG(DEBUG, "No Task Type");\r
@@ -249,7 +249,7 @@ void NSFreeData(NSSchedulerType type, NSTask * task)
             case TASK_SEND_READ:\r
             case TASK_RECV_READ:\r
                 NS_LOG(DEBUG, "NSFreeSync : Free ");\r
-                NSFreeSync((NSSync*) task->taskData);\r
+                NSFreeSync((NSSyncInfo*) task->taskData);\r
                 break;\r
 \r
             default:\r

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 85a20ff..bd97046 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -132,12 +132,12 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
             NS_LOG(DEBUG, "fail to write cache");\r
         }\r
 \r
-        if (NSGetSubscriptionAccepter() == NS_ACCEPTER_PROVIDER)\r
+        if (NSGetSubscriptionAccepter() == NS_ACCESS_ALLOW)\r
         {\r
             NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_PROVIDER");\r
             NSAskAcceptanceToUser(entityHandlerRequest);\r
         }\r
-        else if (NSGetSubscriptionAccepter() == NS_ACCEPTER_CONSUMER)\r
+        else if (NSGetSubscriptionAccepter() == NS_ACCESS_DENY)\r
         {\r
             NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_CONSUMER");\r
             NSSendSubscriptionResponse(entityHandlerRequest, true);\r
@@ -223,7 +223,7 @@ NSResult NSSendResponse(const char * id, bool accepted)
     }\r
 \r
     OCRepPayloadSetUri(payload, NS_COLLECTION_MESSAGE_URI);\r
-    OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_ID, "0000-0000-0000-0000");\r
+    OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_MESSAGE_ID, "0000-0000-0000-0000");\r
     OCRepPayloadSetPropBool(payload, NS_ATTRIBUTE_ACCPETANCE, accepted);\r
 \r
     NSCacheElement * element = NSStorageRead(consumerSubList, id);\r