Update createRemoteEnrollee function.

 - easy-setup support only OCResource which is through UDP Adapter.

Change-Id: I97fb7b63d5bd78cf613bf2d0049859361e28b8b5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10949
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetup.java b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetup.java
index a4ed96e..0e99e2b 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetup.java
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetup.java
@@ -93,15 +93,13 @@ public class EasySetup {
      */
     public synchronized RemoteEnrollee createRemoteEnrollee(OcResource enrolleeResource)
     {
-        // native call
-        if(!enrolleeResource.getResourceTypes().contains(ESConstants.OC_RSRVD_ES_RES_TYPE_PROV)
-                || !enrolleeResource.getResourceInterfaces().contains(OcPlatform.BATCH_INTERFACE))
+        mRemoteEnrollee = nativeCreateRemoteEnrollee(enrolleeResource);
+
+        if(mRemoteEnrollee)
         {
-            Log.e(TAG, "Validation check for OcResource is failed.");
-            return null;
+            mRemoteEnrolleeList.add(mRemoteEnrollee);
+            return mRemoteEnrollee;
         }
-        mRemoteEnrollee = nativeCreateRemoteEnrollee(enrolleeResource);
-        mRemoteEnrolleeList.add(mRemoteEnrollee);
-        return mRemoteEnrollee;
+        return null;
     }
 }

diff --git a/service/easy-setup/mediator/richsdk/src/EasySetup.cpp b/service/easy-setup/mediator/richsdk/src/EasySetup.cpp
index 01f151e..8604787 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/EasySetup.cpp
+++ b/service/easy-setup/mediator/richsdk/src/EasySetup.cpp
@@ -53,13 +53,23 @@ namespace OIC
         {
             if(resource)
             {
-                if(resource->getResourceTypes().at(0) != OC_RSRVD_ES_RES_TYPE_PROV)
+                if(resource->getResourceTypes().at(0) != OC_RSRVD_ES_RES_TYPE_PROV ||
+                   resource->connectivityType() & CT_ADAPTER_TCP)
                 {
-                    OIC_LOG_V (DEBUG, EASYSETUP_TAG, "createRemoteEnrollee : invalid reousrce");
+                    OIC_LOG_V (DEBUG, EASYSETUP_TAG, "createRemoteEnrollee : invalid resource");
                     return nullptr;
                 }
-                return std::shared_ptr< RemoteEnrollee > (new RemoteEnrollee(resource));
+
+                auto interfaces = resource->getResourceInterfaces();
+                for(auto interface : interfaces)
+                {
+                    if(interface.compare(BATCH_INTERFACE) == 0)
+                    {
+                        return std::shared_ptr< RemoteEnrollee > (new RemoteEnrollee(resource));
+                    }
+                }
             }
+            OIC_LOG_V (DEBUG, EASYSETUP_TAG, "createRemoteEnrollee : invalid resource");
             return nullptr;
         }
     }