From 25fc0875be77e18e8d4c8d221325d631cd1737ca Mon Sep 17 00:00:00 2001 From: Vinil Jain Date: Thu, 1 Oct 2015 15:34:39 +0530 Subject: [PATCH] Added JUnit test case -added test case for easysetupstatus -changed signature of easysetupstatus api -Updated comments -Added new states and changed some states Change-Id: I4afd9318f9f8c8ddf9189f856dbab8307946e8e5 Signed-off-by: Vinil Jain Reviewed-on: https://gerrit.iotivity.org/gerrit/3363 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- .../iotivity/service/easysetup/MainActivity.java | 2 +- .../easysetup/core/EasySetupServiceConfigTest.java | 4 +- .../easysetup/core/EasySetupServiceTest.java | 6 +- .../easysetup/core/EasySetupStatusTest.java | 168 +++++++++++++++++++++ .../service/easysetup/core/EasySetupService.java | 36 ++--- .../service/easysetup/core/EasySetupStatus.java | 4 +- .../service/easysetup/core/EnrolleeDevice.java | 13 +- .../service/easysetup/core/EnrolleeState.java | 18 ++- .../easysetup/core/OnBoardingConnection.java | 21 ++- .../easysetup/core/ProvisioningCallback.java | 1 + .../impl/EnrolleeDeviceWiFiOnboarding.java | 11 +- .../service/easysetup/impl/WiFiProvConfig.java | 8 + 12 files changed, 249 insertions(+), 43 deletions(-) create mode 100644 service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java index cf6d115..63b7f9e 100644 --- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java +++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java @@ -116,7 +116,7 @@ public class MainActivity extends Activity { } @Override - public void onProgress(EnrolleeState state) { + public void onProgress(EnrolleeDevice enrolleeDevice) { Log.i("MainActivity", "onProgress() is received "); mHandler.sendEmptyMessage(STATE_CHANGED); } diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java index 20b4b44..7666a11 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java @@ -41,7 +41,7 @@ public class EasySetupServiceConfigTest extends AndroidTestCase { } @Override - public void onProgress(EnrolleeState state) { + public void onProgress(EnrolleeDevice enrolleeDevice) { } }); @@ -59,7 +59,7 @@ public class EasySetupServiceConfigTest extends AndroidTestCase { } @Override - public void onProgress(EnrolleeState state) { + public void onProgress(EnrolleeDevice enrolleeDevice) { } }); diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java index 1331f3a..3e3058c 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java @@ -74,8 +74,8 @@ public class EasySetupServiceTest extends AndroidTestCase { } @Override - public void onProgress(EnrolleeState state) { - // TODO + public void onProgress(EnrolleeDevice enrolleeDevice) { + // Handled in EasySetupStatusTest } }); @@ -121,7 +121,7 @@ public class EasySetupServiceTest extends AndroidTestCase { Log.i("EasySetupTest", "Lock is released"); - if(! mDevice.isSetupSuccessful()) { + if (!mDevice.isSetupSuccessful()) { assertTrue(false); return; } diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java new file mode 100644 index 0000000..c52b05c --- /dev/null +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java @@ -0,0 +1,168 @@ +//****************************************************************** +// +// Copyright 2015 Samsung Electronics All Rights Reserved. +// +//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +package org.iotivity.service.easysetup.core; + +import android.net.wifi.WifiConfiguration; +import android.test.AndroidTestCase; +import android.util.Log; + +import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory; +import org.iotivity.service.easysetup.impl.EnrolleeDeviceWiFiOnboarding; +import org.iotivity.service.easysetup.impl.WiFiOnBoardingConfig; +import org.iotivity.service.easysetup.impl.WiFiProvConfig; + +import java.io.IOException; + +public class EasySetupStatusTest extends AndroidTestCase { + + + public void testStartSetupWithWiFiOnboarding() { + + EasySetupService mService; + EnrolleeDevice mDevice; + EnrolleeDeviceFactory mFactory; + + final Object lock = new Object(); + + + /* Create Easy Setup service */ + mService = EasySetupService.getInstance(getContext(), new EasySetupStatus() { + EnrolleeState old_state = null; + + @Override + public void onFinished(EnrolleeDevice enrolledevice) { + + //countDownLatch.countDown(); + Utility.toNotify(lock); + + if (enrolledevice.isSetupSuccessful()) { + + if (enrolledevice.mOnBoardingConfig.getConnType() == WiFiOnBoardingConfig.ConnType.WiFi) { + IpOnBoardingConnection conn = (IpOnBoardingConnection) enrolledevice.getConnection(); + String ip = conn.getIp(); + if (ip == null || ip.isEmpty()) { + assertTrue(false); + return; + } + String mac = conn.getHardwareAddress(); + if (mac == null || mac.isEmpty()) { + assertTrue(false); + return; + } + // Device configured successfully + assertTrue(true); + } + + } else { + assertTrue(false); + } + } + + @Override + public void onProgress(EnrolleeDevice enrolleeDevice) { + EnrolleeState state = enrolleeDevice.mState; + // TODO + switch (state) { + case DEVICE_INIT_STATE: + Log.d("enrollee state", "DEVICE_INIT_STATE"); + assertTrue(false); + break; + case DEVICE_ON_BOARDING_STATE: + if (old_state == null) + assertTrue(true); + else assertTrue(false); + old_state = EnrolleeState.DEVICE_ON_BOARDING_STATE; + Log.d("enrollee state", "DEVICE_ON_BOARDING_STATE"); + break; + + case DEVICE_ON_BOARDED_STATE: + if (old_state == EnrolleeState.DEVICE_ON_BOARDING_STATE) + assertTrue(true); + else assertTrue(false); + old_state = EnrolleeState.DEVICE_ON_BOARDED_STATE; + Log.d("enrollee state", "DEVICE_ON_BOARDED_STATE"); + break; + + case DEVICE_PROVISIONING_STATE: + if (old_state == EnrolleeState.DEVICE_ON_BOARDED_STATE) + assertTrue(true); + else assertTrue(false); + old_state = EnrolleeState.DEVICE_PROVISIONING_STATE; + Log.d("enrollee state", "DEVICE_PROVISIONING_STATE"); + break; + + case DEVICE_PROVISIONED_STATE: + if (old_state == EnrolleeState.DEVICE_PROVISIONING_STATE) + assertTrue(true); + else assertTrue(false); + Log.d("enrollee state", "DEVICE_PROVISIONING_SUCCESS_STATE"); + break; + + default: + Log.d("enrollee state", "unknown state"); + assertTrue(false); + break; + } + + } + }); + + + /* Create On boarding configuration */ + WiFiOnBoardingConfig mWiFiOnBoardingConfig = new WiFiOnBoardingConfig(); + mWiFiOnBoardingConfig.setSSId("EasySetup123"); + mWiFiOnBoardingConfig.setSharedKey("EasySetup123"); + mWiFiOnBoardingConfig.setAuthAlgo(WifiConfiguration.AuthAlgorithm.OPEN); + mWiFiOnBoardingConfig.setKms(WifiConfiguration.KeyMgmt.WPA_PSK); + + /* Create provisioning configuration */ + WiFiProvConfig mWiFiProvConfig = new WiFiProvConfig("hub2.4G", "11112222"); + + /* Create enrolling device factory instance */ + mFactory = EnrolleeDeviceFactory.newInstance(getContext()); + + /* Create enrolling device */ + mDevice = mFactory.newEnrolleeDevice(mWiFiOnBoardingConfig, mWiFiProvConfig); + + try { + mService.startSetup(mDevice); + } catch (IOException e) { + } + + try { + + Utility.toWait(lock); + + Log.i("EasySetupTest", "Lock is released"); + + IpOnBoardingConnection conn = (IpOnBoardingConnection) mDevice.getConnection(); + + Log.i("EasySetupTest", "Ip" + conn.getIp()); + Log.i("EasySetupTest", "MAC" + conn.getHardwareAddress()); + + // Device configured successfully + + } catch (Exception e) { + e.printStackTrace(); + } + + } + +} \ No newline at end of file diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java index dba4cc0..a573416 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java @@ -25,7 +25,6 @@ package org.iotivity.service.easysetup.core; import android.content.Context; import android.util.Log; -import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory; import org.iotivity.service.easysetup.mediator.EasySetupManager; import org.iotivity.service.easysetup.mediator.ProvisionEnrollee; @@ -41,7 +40,7 @@ import java.util.ArrayList; */ public class EasySetupService { - public static final String TAG = EasySetupService.class.getName(); + private static final String TAG = EasySetupService.class.getName(); private static EasySetupService sInstance; @@ -53,7 +52,6 @@ public class EasySetupService { private static Context mContext; - public EnrolleeDeviceFactory mDeviceFactory; ProvisionEnrollee mProvisionEnrolleeInstance; @@ -62,7 +60,7 @@ public class EasySetupService { mProvisioningCallback = new ProvisioningCallbackImpl(mCallback); mEnrolleeDeviceList = new ArrayList(); mContext = null; - mDeviceFactory = null; + } /** @@ -110,7 +108,9 @@ public class EasySetupService { enrolledevice.startProvisioning(mProvisioningCallback); return; } + enrolledevice.mState = EnrolleeState.DEVICE_ON_BOARDING_STATE; + mCallback.onProgress(enrolledevice); enrolledevice.startOnBoarding(new OnBoardingCallback() { @Override @@ -118,10 +118,12 @@ public class EasySetupService { if (connection.isConnected()) { Log.i(TAG, "On boarding is successful "); // Start provisioning here + enrolledevice.mState = EnrolleeState.DEVICE_ON_BOARDED_STATE; + mCallback.onProgress(enrolledevice); enrolledevice.setConnection(connection); enrolledevice.startProvisioning(mProvisioningCallback); } else { - enrolledevice.mState = EnrolleeState.DEVICE_PROVISIONING_FAILED_STATE; + enrolledevice.mState = EnrolleeState.DEVICE_INIT_STATE; mProvisioningCallback.onFinished(enrolledevice); } @@ -137,30 +139,26 @@ public class EasySetupService { * @param enrolleedevice Device to be enrolled in network */ public synchronized void stopSetup(EnrolleeDevice enrolleedevice) { - if (enrolleedevice.mState == EnrolleeState.DEVICE_ON_BOARDING_STATE) { - if (mEnrolleeDeviceList.contains(enrolleedevice)) { + if (mEnrolleeDeviceList.contains(enrolleedevice)) { + enrolleedevice.mState = EnrolleeState.DEVICE_INIT_STATE; + mCallback.onProgress(enrolleedevice); + if (enrolleedevice.mState == EnrolleeState.DEVICE_ON_BOARDING_STATE) { Log.i(TAG, "stopOnBoardingProcess for enrolleedevice"); enrolleedevice.stopOnBoardingProcess(); mEnrolleeDeviceList.remove(enrolleedevice); - } - } else if (enrolleedevice.mState == EnrolleeState.DEVICE_PROVISIONING_STATE) { - if (mEnrolleeDeviceList.contains(enrolleedevice)) { + } else if (enrolleedevice.mState == EnrolleeState.DEVICE_PROVISIONING_STATE) { Log.i(TAG, "stopOnBoardingProcess for enrolleedevice"); enrolleedevice.stopOnBoardingProcess(); - Log.i(TAG, "stopEnrolleeProvisioning for enrolleedevice"); //Native Api call to stop on-going enrolling process for the enrolling device EasySetupManager.getInstance().stopEnrolleeProvisioning(enrolleedevice .mOnBoardingConfig.getConnType().getValue()); mEnrolleeDeviceList.remove(enrolleedevice); + } } } - public synchronized void getEnrolleeDevice(OnBoardingConfig connType) { - mDeviceFactory = EnrolleeDeviceFactory.newInstance(mContext); - } - class ProvisioningCallbackImpl extends ProvisioningCallback { private final EasySetupStatus mCallback; @@ -180,7 +178,11 @@ public class EasySetupService { } } - } + @Override + public void onProgress(EnrolleeDevice enrolledevice) { + mCallback.onProgress(enrolledevice); + } -} + } +} \ No newline at end of file diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java index 4ba7fba..4ad785a 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java @@ -43,8 +43,8 @@ public interface EasySetupStatus { * setup process This method is called on worker thread, UI operations to be * executed on main / Ui Thread. * - * @param state Gives state of the device changed during easy setup process + * @param enrolleeDevice Gives state of the device changed during easy setup process */ - public void onProgress(EnrolleeState state); + public void onProgress(EnrolleeDevice enrolleeDevice); } diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java index ec3bd1b..2d87190 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java @@ -83,10 +83,15 @@ public abstract class EnrolleeDevice { * * @param conn Connectivity between Enrollee device & Mediator device. */ - public void setConnection(OnBoardingConnection conn) { + protected void setConnection(OnBoardingConnection conn) { mConnection = conn; } + /** + * This method returns the OnBoardingConnection object depending on the connection type + * + * @return onBoardingConnection object + */ public OnBoardingConnection getConnection() { return mConnection; } @@ -119,13 +124,13 @@ public abstract class EnrolleeDevice { */ public boolean isSetupSuccessful() { - return (mState == EnrolleeState.DEVICE_PROVISIONING_SUCCESS_STATE) ? true : false; + return (mState == EnrolleeState.DEVICE_PROVISIONED_STATE) ? true : false; } /** * sets error occured during easy setup process */ - public void setError(EnrolleeSetupError error) { + protected void setError(EnrolleeSetupError error) { mError = error; } @@ -153,7 +158,7 @@ public abstract class EnrolleeDevice { * @return True if on-boarded successfully or False */ - public boolean onBoarded() { + protected boolean onBoarded() { return (mState == EnrolleeState.DEVICE_PROVISIONING_STATE) ? true : false; } diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java index 6b91254..8ce6dcf 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java @@ -36,6 +36,11 @@ public enum EnrolleeState { /** * Device will move to this state after successful on-boarding of the device */ + DEVICE_ON_BOARDED_STATE, + + /** + * Device will move to this state once the on boarding begins + */ DEVICE_ON_BOARDING_STATE, /** @@ -46,19 +51,20 @@ public enum EnrolleeState { /** * Easy setup process is successful. */ - DEVICE_PROVISIONING_SUCCESS_STATE, + DEVICE_PROVISIONED_STATE, /** - * Device is not able to provisioned. - * Easy setup process failed to enrolled the device in the network + * This state is arbitrary one, any time device can come into this state + * Device will move to this state if the ownership transfer initiated by the Application */ - DEVICE_PROVISIONING_FAILED_STATE, + DEVICE_OWNERSHIP_TRANSFERRING_STATE, /** * This state is arbitrary one, any time device can come into this state - * Device will move to this state if the ownership transfer initiated by the Application + * Device will move to this state if the ownership transfer is completed */ - DEVICE_OWNERSHIP_TRANSFER_STATE, + DEVICE_OWNERSHIP_TRANSFERRED_STATE, + /** * This state is arbitrary one, any time device can come into this state diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java index 80c2fa0..342bd1f 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java @@ -21,15 +21,30 @@ */ package org.iotivity.service.easysetup.core; +/** + * This interface contains the connection details of the enrollee device + */ public interface OnBoardingConnection { - - // Get the implementation of the Connection + /** + * This method returns the implementation of the Connection + * + * @return implementation + */ public Object getConnection(); - // Any general description on the connectivity. + /** + * This method returns description on the connectivity. + * + * @return description + */ public String getDesc(); + /** + * This method is used to know if the device is connected or not + * + * @return True if connected or False + */ public boolean isConnected(); } diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java index 887530a..d1656d0 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java @@ -24,4 +24,5 @@ package org.iotivity.service.easysetup.core; public abstract class ProvisioningCallback { public abstract void onFinished(EnrolleeDevice enrolledevice); + public abstract void onProgress(EnrolleeDevice enrolledevice); } diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java index 1af6d45..2b022c7 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java @@ -135,8 +135,6 @@ public class EnrolleeDeviceWiFiOnboarding extends EnrolleeDevice { @Override protected void startProvisioningProcess(OnBoardingConnection conn) { - mState = EnrolleeState.DEVICE_PROVISIONING_STATE; - try { Log.i(TAG, "waiting for 15 seconds to start provisioning"); Thread.sleep(15000);//Sleep for allowing thin device to start the services @@ -144,7 +142,9 @@ public class EnrolleeDeviceWiFiOnboarding extends EnrolleeDevice { e.printStackTrace(); } - + mState = EnrolleeState.DEVICE_PROVISIONING_STATE; + mProvisioningCallback.onProgress(this); + final EnrolleeDevice device = this; if (mProvConfig.getConnType() == ProvisioningConfig.ConnType.WiFi) { provisionEnrolleInstance = new ProvisionEnrollee(mContext); @@ -154,9 +154,10 @@ public class EnrolleeDeviceWiFiOnboarding extends EnrolleeDevice { public void onFinishProvisioning(int statuscode) { Log.i(TAG, "Provisioning is finished with status code " + statuscode); - mState = (statuscode == 0) ? EnrolleeState.DEVICE_PROVISIONING_SUCCESS_STATE - : EnrolleeState.DEVICE_PROVISIONING_FAILED_STATE; + mState = (statuscode == 0) ? EnrolleeState.DEVICE_PROVISIONED_STATE + : EnrolleeState.DEVICE_INIT_STATE; stopOnBoardingProcess(); + mProvisioningCallback.onProgress(device); mProvisioningCallback.onFinished(EnrolleeDeviceWiFiOnboarding.this); } }); diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java index 72ffb5e..8d9ab15 100644 --- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java +++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java @@ -53,10 +53,18 @@ public class WiFiProvConfig implements ProvisioningConfig { return mConnType; } + /** + * This method returns the SSID of the Target WIFI network + * @return SSID of Target Network + */ public String getSsId() { return mSsId; } + /** + * This method returns the password of the Target WIFI network + * @return password of Target Network + */ public String getPassword() { return mPassword; } -- 2.7.4