1. Added sendMessage without Topics in sample application

[platform/upstream/iotivity.git] / service / notification / cpp-wrapper / consumer / src / NSConsumerService.cpp

diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
index deb31d9..2c083e3 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
@@ -49,6 +49,7 @@ namespace OIC
                 nsProvider->setTopicList(new NSTopicsList(topicLL));\r
                 if (state == NS_DISCOVERED)\r
                 {\r
+                    nsProvider->setProviderSubscribedState(NSProviderSubscribedState::DISCOVERED);\r
                     if (discoveredCallback != NULL)\r
                     {\r
                         NS_LOG(DEBUG, "initiating the Discovered callback : NS_DISCOVERED, policy false");\r
@@ -57,6 +58,7 @@ namespace OIC
                 }\r
                 else if (state == NS_ALLOW)\r
                 {\r
+                    nsProvider->setProviderSubscribedState(NSProviderSubscribedState::SUBSCRIBED);\r
                     if (discoveredCallback != NULL)\r
                     {\r
                         NS_LOG(DEBUG, "initiating the Discovered callback : NS_ALLOW, policy true");\r
@@ -73,6 +75,7 @@ namespace OIC
                 delete nsProvider;\r
                 if (state == NS_ALLOW)\r
                 {\r
+                    oldProvider->setProviderSubscribedState(NSProviderSubscribedState::SUBSCRIBED);\r
                     if (changeCallback != NULL)\r
                     {\r
                         NS_LOG(DEBUG, "initiating the callback for Response : NS_ALLOW");\r
@@ -81,6 +84,7 @@ namespace OIC
                 }\r
                 else if (state == NS_DENY)\r
                 {\r
+                    oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY);\r
                     NSConsumerService::getInstance()->getAcceptedProviders().remove(oldProvider);\r
                     if (changeCallback != NULL)\r
                     {\r
@@ -101,10 +105,12 @@ namespace OIC
                 }\r
                 else if (state == NS_STOPPED)\r
                 {\r
+                    oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY);\r
+                    NSConsumerService::getInstance()->getAcceptedProviders().remove(oldProvider);\r
                     NS_LOG(DEBUG, "initiating the State callback : NS_STOPPED");\r
                     if (changeCallback != NULL)\r
                     {\r
-                        NS_LOG(DEBUG, "initiating the callback for Response : NS_TOPIC");\r
+                        NS_LOG(DEBUG, "initiating the callback for Response : NS_STOPPED");\r
                         changeCallback((NSProviderState)state);\r
                     }\r
                 }\r
@@ -199,6 +205,11 @@ namespace OIC
         {\r
             NS_LOG(DEBUG, "stop - IN");\r
             NSStopConsumer();\r
+            for (auto it : getAcceptedProviders())\r
+            {\r
+                delete it;\r
+            }\r
+            getAcceptedProviders().clear();\r
             NS_LOG(DEBUG, "stop - OUT");\r
             return;\r
         }\r