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
old mode 100644 (file)
new mode 100755 (executable)
index 3fb508e..edbe845
--- 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
@@ -22,8 +22,9 @@ package org.iotivity.service.easysetup.impl;
 import android.content.Context;
 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;
@@ -66,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;
@@ -81,7 +84,8 @@ public class EnrolleeDeviceBLEOnBoarding extends EnrolleeDevice {
         }
     };
 
-    protected EnrolleeDeviceBLEOnBoarding(Context context, OnBoardingConfig onBoardingConfig, ProvisioningConfig provConfig) {
+    protected EnrolleeDeviceBLEOnBoarding(Context context, OnBoardingConfig onBoardingConfig,
+                                          ProvisioningConfig provConfig) {
         super(onBoardingConfig, provConfig);
         mContext = context;
         bleManager = new BLEManager(mContext, (BLEOnBoardingConfig) onBoardingConfig);
@@ -92,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");
@@ -105,41 +109,39 @@ 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() + "");
 
-        //if (mProvConfig.getConnType() == ProvisioningConfig.ConnType.WiFi)
-        {
-
-            provisionEnrolleInstance = new ProvisionEnrollee(mContext);
-            provisionEnrolleInstance.registerProvisioningHandler(new IProvisioningListener() {
-                @Override
-                public void onFinishProvisioning(int statuscode) {
-                    mState = (statuscode == 0) ? EnrolleeState.DEVICE_PROVISIONING_SUCCESS_STATE : EnrolleeState.DEVICE_PROVISIONING_FAILED_STATE;
-                    mProvisioningCallback.onFinished(EnrolleeDeviceBLEOnBoarding.this);
-                }
-            });
-
-            BleConnection connection = (BleConnection) conn;
-            WiFiProvConfig wifiProvConfig = (WiFiProvConfig) mProvConfig;
-            if (mContext == null)
-                Log.d("BLE context is null", "");
-            else Log.d("BLE context is not null", "");
-            easySetupManagerNativeInstance = EasySetupManager.getInstance();
+        mState = EnrolleeState.DEVICE_PROVISIONING_STATE;
+        provisionEnrolleInstance = new ProvisionEnrollee(mContext);
+        provisionEnrolleInstance.registerProvisioningHandler(new IProvisioningListener() {
+            @Override
+            public void onFinishProvisioning(int statuscode) {
+                mState = (statuscode == 0) ? EnrolleeState.DEVICE_PROVISIONING_SUCCESS_STATE :
+                        EnrolleeState.DEVICE_PROVISIONING_FAILED_STATE;
+                mProvisioningCallback.onFinished(EnrolleeDeviceBLEOnBoarding.this);
+            }
+        });
 
+        BleConnection connection = (BleConnection) conn;
+        WiFiProvConfig wifiProvConfig = (WiFiProvConfig) mProvConfig;
+        easySetupManagerNativeInstance = EasySetupManager.getInstance();
+        easySetupManagerNativeInstance.setApplicationContext(mContext);
+        easySetupManagerNativeInstance.initEasySetup();
+        Log.d("init", "successful");
 
-            easySetupManagerNativeInstance.setApplicationContext(mContext);
-            easySetupManagerNativeInstance.initEasySetup();
-            Log.d("init", "successful");
-            easySetupManagerNativeInstance.provisionEnrollee(connection.getMacaddress(), wifiProvConfig.getSsId(), wifiProvConfig.getPassword(), 0);
+        easySetupManagerNativeInstance.provisionEnrollee(connection.getMacaddress(),
+                wifiProvConfig.getSsId(),
+                wifiProvConfig.getPassword(),
+                mOnBoardingConfig.getConnType().getValue());
 
-        }
 
     }
 }
\ No newline at end of file