Fixed Java prevent issue

[platform/upstream/iotivity.git] / service / easy-setup / sdk / mediator / android / EasySetupCore / src / main / java / org / iotivity / service / easysetup / impl / EnrolleeDeviceBLEOnBoarding.java

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 c7a339d..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
@@ -24,7 +24,7 @@ import android.util.Log;
 
 import org.iotivity.base.OcConnectivityType;
 import org.iotivity.service.easysetup.core.BleConnection;
-import org.iotivity.service.easysetup.core.ConnectionInterface;
+import org.iotivity.service.easysetup.core.OnBoardingConnection;
 import org.iotivity.service.easysetup.core.EnrolleeDevice;
 import org.iotivity.service.easysetup.core.EnrolleeState;
 import org.iotivity.service.easysetup.core.OnBoardingConfig;
@@ -67,6 +67,8 @@ public class EnrolleeDeviceBLEOnBoarding extends EnrolleeDevice {
                     BleConnection conn = new BleConnection();
                     conn.setMacaddress(connectedDevice.getHWAddr());
                     conn.setConnectivity(true);
+                    conn.setmServiceUUID(connectedDevice.getIpAddr());
+                    conn.setmDeviceName(connectedDevice.getDevice());
                     Log.d("ESBLEOnBoarding", "Entered" + ":" + finalResult);
                     mOnBoardingCallback.onFinished(conn);
                     return;
@@ -94,7 +96,7 @@ public class EnrolleeDeviceBLEOnBoarding extends EnrolleeDevice {
         Log.i(TAG, "Starging on boarding process");
 
         boolean status = bleManager.setupBluetooth();
-
+        mState = EnrolleeState.DEVICE_ON_BOARDING_STATE;
         Log.i(TAG, "Bluetooth started with status " + status);
         if (status) {
             Log.i(TAG, "Scanning available BLE devices");
@@ -107,16 +109,17 @@ public class EnrolleeDeviceBLEOnBoarding extends EnrolleeDevice {
     @Override
     protected void stopOnBoardingProcess() {
 
-        bleManager.stopscan();
+        if (bleManager != null)
+            bleManager.stopscan();
 
     }
 
     @Override
-    protected void startProvisioningProcess(ConnectionInterface conn) {
+    protected void startProvisioningProcess(OnBoardingConnection conn) {
 
         Log.i("start provisioning BLE", mProvConfig.getConnType() + "");
 
-
+        mState = EnrolleeState.DEVICE_PROVISIONING_STATE;
         provisionEnrolleInstance = new ProvisionEnrollee(mContext);
         provisionEnrolleInstance.registerProvisioningHandler(new IProvisioningListener() {
             @Override
@@ -133,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());
 
 
     }