Used OCConnectivityType b/w Java & C++ layer

Change-Id: I34f6a55172b72414a251712d12e95bc1df1abc70
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3037
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
index 2852f9e..6da4178 100755 (executable)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
@@ -22,6 +22,8 @@
 \r
 package org.iotivity.service.easysetup.core;\r
 \r
+import org.iotivity.base.OcConnectivityType;\r
+\r
 /**\r
  * It contains configuration details about the connectivity type between the Enrollee device &\r
  * Mediator device in order to perform on-boarding.\r
@@ -34,8 +36,8 @@ public interface OnBoardingConfig {
      */\r
     public static enum ConnType {\r
         // Note : Enum Ids should matched with Native Ids\r
-        WiFi(0),\r
-        BLE(1);\r
+        WiFi(OcConnectivityType.CT_DEFAULT.getValue()),\r
+        BLE(OcConnectivityType.CT_ADAPTER_GATT_BTLE.getValue());\r
 \r
         private int mConnType;\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceBLEOnBoarding.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceBLEOnBoarding.java
index 406ee0e..edbe845 100755 (executable)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceBLEOnBoarding.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceBLEOnBoarding.java
@@ -136,11 +136,11 @@ public class EnrolleeDeviceBLEOnBoarding extends EnrolleeDevice {
         easySetupManagerNativeInstance.setApplicationContext(mContext);
         easySetupManagerNativeInstance.initEasySetup();
         Log.d("init", "successful");
-        OcConnectivityType ocConnectivityType = OcConnectivityType.CT_ADAPTER_GATT_BTLE;
+
         easySetupManagerNativeInstance.provisionEnrollee(connection.getMacaddress(),
                 wifiProvConfig.getSsId(),
                 wifiProvConfig.getPassword(),
-                ocConnectivityType.getValue());
+                mOnBoardingConfig.getConnType().getValue());
 
 
     }

diff --git a/service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp b/service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp
index 73851fa..60628dc 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp
+++ b/service/easy-setup/sdk/mediator/android/jni/jni_easy_setup.cpp
@@ -187,14 +187,7 @@ jConnectivityType)
 {
 LOGI("JNI Stop Easy Setup: Entering");
 
-OCConnectivityType connecitivityType = OCConnectivityType::CT_DEFAULT;
-
-if(jConnectivityType == 0)
-{
-connecitivityType = OCConnectivityType::CT_ADAPTER_IP;
-}
-
-StopProvisioning(connecitivityType);
+StopProvisioning((OCConnectivityType) jConnectivityType);
 
 return;
 }