Implementation of JNI for subscribe device presence to RD

[platform/upstream/iotivity.git] / resource / include / InProcClientWrapper.h

diff --git a/resource/include/InProcClientWrapper.h b/resource/include/InProcClientWrapper.h
index e97c990..9565d3b 100644 (file)
--- a/resource/include/InProcClientWrapper.h
+++ b/resource/include/InProcClientWrapper.h
@@ -101,11 +101,11 @@ namespace OC
         };
 
 #ifdef WITH_MQ
-        struct CreateMQTopicContext
+        struct MQTopicContext
         {
-            MQCreateTopicCallback callback;
+            MQTopicCallback callback;
             std::weak_ptr<IClientWrapper> clientWrapper;
-            CreateMQTopicContext(MQCreateTopicCallback cb, std::weak_ptr<IClientWrapper> cw)
+            MQTopicContext(MQTopicCallback cb, std::weak_ptr<IClientWrapper> cw)
                 : callback(cb), clientWrapper(cw){}
         };
 #endif
@@ -136,6 +136,7 @@ namespace OC
             const OCDevAddr& devAddr,
             const std::string& uri,
             const QueryParamsMap& queryParams, const HeaderOptions& headerOptions,
+            OCConnectivityType connectivityType,
             GetCallback& callback, QualityOfService QoS);
 
         virtual OCStackResult PutResourceRepresentation(
@@ -155,6 +156,7 @@ namespace OC
             const OCDevAddr& devAddr,
             const std::string& uri,
             const HeaderOptions& headerOptions,
+            OCConnectivityType connectivityType,
             DeleteCallback& callback, QualityOfService QoS);
 
         virtual OCStackResult ObserveResource(
@@ -179,11 +181,13 @@ namespace OC
 
         virtual OCStackResult UnsubscribePresence(OCDoHandle handle);
 
+#ifdef WITH_CLOUD
         virtual OCStackResult SubscribeDevicePresence(OCDoHandle* handle,
                                                       const std::string& host,
-                                                      const QueryParamsList& queryParams,
+                                                      const std::vector<std::string>& di,
                                                       OCConnectivityType connectivityType,
                                                       ObserveCallback& callback);
+#endif
 
         OCStackResult GetDefaultQos(QualityOfService& QoS);
 
@@ -200,14 +204,14 @@ namespace OC
             const OCDevAddr& devAddr,
             const std::string& resourceUri,
             const QueryParamsMap& queryParams, const HeaderOptions& headerOptions,
-            FindCallback& callback, QualityOfService QoS);
+            MQTopicCallback& callback, QualityOfService QoS);
 
         virtual OCStackResult PutMQTopicRepresentation(
             const OCDevAddr& devAddr,
             const std::string& uri,
             const OCRepresentation& rep,
             const QueryParamsMap& queryParams, const HeaderOptions& headerOptions,
-            MQCreateTopicCallback& callback, QualityOfService QoS);
+            MQTopicCallback& callback, QualityOfService QoS);
 #endif
 
     private: