Remove unnecessary attribute

An attribute, NS_ATTRIBUTE_ACCEPTANCE, is removed as the usage has
been changed. Instead the value of MessageID is set to NS_ALLOW(1)
or NS_DENY(2) for the response of subscription.

Change-Id: I48d6b34449602fec9e083620273f991a52ef4bbe
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10527
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index a3c52ff..70ca1ca 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -35,7 +35,6 @@
 #define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
 #define NS_ATTRIBUTE_SYNC "SYNC_URI"
 #define NS_ATTRIBUTE_TOPIC "TOPIC_URI"
-#define NS_ATTRIBUTE_ACCPETANCE "ACCEPTANCE" // not used
 #define NS_ATTRIBUTE_MESSAGE_ID "MESSAGE_ID"
 #define NS_ATTRIBUTE_PROVIDER_ID "PROVIDER_ID"
 #define NS_ATTRIBUTE_CONSUMER_ID "CONSUMER_ID"

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 61aec35..238d0ed 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -263,8 +263,8 @@ NSResult NSSendResponse(const char * id, bool accepted)
     }\r
 \r
     OCRepPayloadSetUri(payload, NS_COLLECTION_MESSAGE_URI);\r
-    OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, 1);\r
-    OCRepPayloadSetPropBool(payload, NS_ATTRIBUTE_ACCPETANCE, accepted);\r
+    (accepted) ? OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, NS_ALLOW)\r
+        : OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, NS_DENY);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
 \r
     NSCacheElement * element = NSStorageRead(consumerSubList, id);\r