Fix for compilation errors in Android EasySetup

Fixed OCConnectivity Type in Android Easy Setup Code based on latest master branch changes.

Change-Id: I4d7e0e207c152e6596a817704edf35957dec6e07
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2308

diff --git a/resource/csdk/connectivity/SConscript b/resource/csdk/connectivity/SConscript
index 777f7d9..e52b77d 100644 (file)
--- a/resource/csdk/connectivity/SConscript
+++ b/resource/csdk/connectivity/SConscript
@@ -66,7 +66,7 @@ if build_sample == 'ON':
 
                if target_os == 'darwin':
                        target_path = 'linux'
-               env.SConscript('./samples/' + target_path + '/SConscript')
+               #env.SConscript('./samples/' + target_path + '/SConscript')
 
        elif target_os in ['android']:
                env.SConscript('./samples/' + target_os + '/SConscript')

diff --git a/resource/csdk/connectivity/samples/android/casample/settings.gradle b/resource/csdk/connectivity/samples/android/casample/settings.gradle
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/service/SConscript b/service/SConscript
index 34df3ab..a6ca193 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -52,5 +52,4 @@ if target_os in ['arduino','android', 'linux']:
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
 
-#if target_os in ['arduino','android', 'linux']:
-        #SConscript('easy-setup/SConscript')
+

diff --git a/service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
index 3b785e5..a173356 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
@@ -75,7 +75,7 @@ public class MainActivity extends Activity implements IProvisioningListener,
         textView1 = (TextView) findViewById(R.id.textView1);\r
 \r
         // OnBoarding Process\r
-        onBoardingHandlerInstance = new OnBoardEnrollee(this, OcConnectivityType.IPV4);\r
+        onBoardingHandlerInstance = new OnBoardEnrollee(this, OcConnectivityType.CT_IP_USE_V4);\r
         onBoardingHandlerInstance.registerOnBoardingStatusHandler(this);\r
 \r
         // Get intent, action and MIME type\r
@@ -102,7 +102,7 @@ public class MainActivity extends Activity implements IProvisioningListener,
         super.onDestroy();\r
         if(provisionEnrolleInstance != null)\r
         {\r
-            provisionEnrolleInstance.stopEnrolleeProvisioning(OcConnectivityType.IPV4);\r
+            provisionEnrolleInstance.stopEnrolleeProvisioning(OcConnectivityType.CT_IP_USE_V4);\r
         }\r
         onBoardingHandlerInstance.disableWiFiAP();\r
         finish();\r
@@ -175,7 +175,7 @@ public class MainActivity extends Activity implements IProvisioningListener,
                         .set(WifiConfiguration.KeyMgmt.WPA_PSK);\r
                 netConfig.preSharedKey = "EasySetup123";\r
 \r
-                transportConfig.setConnectivityType(OcConnectivityType.IPV4);\r
+                transportConfig.setConnectivityType(OcConnectivityType.CT_IP_USE_V4);\r
                 transportConfig.setNetConfig(netConfig);\r
                 onBoardingHandlerInstance.enableNetwork(transportConfig, true);\r
             }\r
@@ -202,13 +202,13 @@ public class MainActivity extends Activity implements IProvisioningListener,
                 IPEnrolleeDevice ipEnrolleeDevice = (IPEnrolleeDevice)connectedDevice;\r
                 IPProvisioningInfo ipProvisioningInfo = new IPProvisioningInfo();\r
 \r
-                ipProvisioningInfo.setConnectivityType(OcConnectivityType.IPV4);\r
+                ipProvisioningInfo.setConnectivityType(OcConnectivityType.CT_IP_USE_V4);\r
                 ipProvisioningInfo.setIpAddress(ipEnrolleeDevice.getIpAddr());\r
                 ipProvisioningInfo.setNetSSID("EasySetup123");\r
                 ipProvisioningInfo.setNetPWD("EasySetup123");\r
 \r
                 provisionEnrolleInstance.provisionEnrollee(\r
-                        ipProvisioningInfo, OcConnectivityType.IPV4);\r
+                        ipProvisioningInfo, OcConnectivityType.CT_IP_USE_V4);\r
                 easySetupCount++;\r
                 Log.i("EasyConnect", "easy Setup Count-" + easySetupCount);\r
                 Log.i("EasyConnect",\r
@@ -247,7 +247,7 @@ public class MainActivity extends Activity implements IProvisioningListener,
     public void deviceOnBoardingStatus(EnrolleeDevice enrolleeDevice) {\r
         // TODO Auto-generated method stub\r
         // TODO Auto-generated method stub\r
-        if(enrolleeDevice.getConnectivityType() == OcConnectivityType.IPV4) {\r
+        if(enrolleeDevice.getConnectivityType() == OcConnectivityType.CT_IP_USE_V4) {\r
             IPEnrolleeDevice ipEnrolleeDevice = (IPEnrolleeDevice)enrolleeDevice;\r
             if (ipEnrolleeDevice.getIpAddr() != null) {\r
                 String finalResult = "Easy Connect : ";\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java
index 87f8a8f..882e284 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java
@@ -35,7 +35,7 @@ public class OnBoardEnrollee {
      * Constructor for OnBoardEnrollee.\r
      */\r
     public OnBoardEnrollee(Context context, OcConnectivityType connectivityType) {\r
-        if(connectivityType == OcConnectivityType.IPV4) {\r
+        if(connectivityType == OcConnectivityType.CT_IP_USE_V4) {\r
             wifiSoftAPManager = new WiFiSoftAPManager(context);\r
         }\r
         this.selectedConnectivityType = connectivityType;\r
@@ -47,13 +47,13 @@ public class OnBoardEnrollee {
     }\r
 \r
     public void startDeviceScan(final int reachableTimeout) {\r
-        if(selectedConnectivityType == OcConnectivityType.IPV4) {\r
+        if(selectedConnectivityType == OcConnectivityType.CT_IP_USE_V4) {\r
             wifiSoftAPManager.getClientList(this.deviceScanListener, reachableTimeout);\r
         }\r
     }\r
 \r
     public void enableNetwork(OnBoardingConfig transportConfig, boolean enabled) {\r
-        if(selectedConnectivityType == OcConnectivityType.IPV4) {\r
+        if(selectedConnectivityType == OcConnectivityType.CT_IP_USE_V4) {\r
             wifiSoftAPManager.setWifiApEnabled(\r
                     ((WiFiSoftAPOnBoardingConfig)transportConfig).getNetConfig(),\r
                     true);\r
@@ -61,7 +61,7 @@ public class OnBoardEnrollee {
     }\r
 \r
     public void disableWiFiAP() {\r
-        if(selectedConnectivityType == OcConnectivityType.IPV4) {\r
+        if(selectedConnectivityType == OcConnectivityType.CT_IP_USE_V4) {\r
             wifiSoftAPManager.setWifiApEnabled(null, false);\r
         }\r
     }\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
index 91c8d20..26d4215 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
@@ -34,20 +34,20 @@ public class ProvisionEnrollee {
 \r
     public void provisionEnrollee(ProvisioningInfo provisioningInfo,\r
                                   OcConnectivityType connectivityType) {\r
-        if(connectivityType == OcConnectivityType.IPV4)\r
+        if(connectivityType == OcConnectivityType.CT_IP_USE_V4)\r
         {\r
             easySetupManagerNativeInstance.initEasySetup();\r
             easySetupManagerNativeInstance.provisionIPEnrollee(\r
                     ((IPProvisioningInfo)provisioningInfo).getIpAddress(),\r
                     ((IPProvisioningInfo)provisioningInfo).getNetSSID(),\r
                     ((IPProvisioningInfo)provisioningInfo).getNetPWD(),\r
-                    OcConnectivityType.IPV4.getValue());\r
+                    OcConnectivityType.CT_IP_USE_V4.getValue());\r
         }\r
     }\r
 \r
     public void stopEnrolleeProvisioning(OcConnectivityType connectivityType) {\r
         easySetupManagerNativeInstance\r
-                .stopEnrolleeProvisioning(OcConnectivityType.IPV4.getValue());\r
+                .stopEnrolleeProvisioning(OcConnectivityType.CT_IP_USE_V4.getValue());\r
     }\r
 \r
     public void ProvisioningStatusCallBack(int statuscode) {\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/common/EnrolleeDeviceFactory.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/common/EnrolleeDeviceFactory.java
index 3a4333f..808906f 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/common/EnrolleeDeviceFactory.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/common/EnrolleeDeviceFactory.java
@@ -33,7 +33,7 @@ import org.iotivity.service.easysetup.mediator.ip.IPEnrolleeDevice;
 public class EnrolleeDeviceFactory {
     public static EnrolleeDevice getDevice(OcConnectivityType connectivityType)
     {
-        if(connectivityType == OcConnectivityType.IPV4)
+        if(connectivityType == OcConnectivityType.CT_IP_USE_V4)
         {
             return new IPEnrolleeDevice();
         }

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
index e7e20dd..74d7238 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
@@ -94,7 +94,7 @@ public class WiFiSoftAPManager {
         final IPEnrolleeDevice result = new IPEnrolleeDevice();
         boolean deviceAddedToList = false;
 
-        result.setConnectivityType(OcConnectivityType.IPV4);
+        result.setConnectivityType(OcConnectivityType.CT_IP_USE_V4);
 
         if (appNotification.size() > 0) {
             for (EnrolleeOnBoardingInfo ipDeviceOnBoardingNotification : appNotification) {
@@ -138,7 +138,7 @@ public class WiFiSoftAPManager {
             }
             if (!deviceAddedToList) {
                 IPEnrolleeDevice ipEnrolleeDevice = (IPEnrolleeDevice) EnrolleeDeviceFactory.getDevice(
-                        OcConnectivityType.IPV4);
+                        OcConnectivityType.CT_IP_USE_V4);
                 ipEnrolleeDevice.setIpAddr(ipAddr);
                 ipEnrolleeDevice.setHWAddr(macAddr);
                 if (isReachable) {
@@ -160,7 +160,7 @@ public class WiFiSoftAPManager {
             }
         } else {
             IPEnrolleeDevice ipEnrolleeDevice = (IPEnrolleeDevice)EnrolleeDeviceFactory.getDevice(
-                    OcConnectivityType.IPV4);
+                    OcConnectivityType.CT_IP_USE_V4);
             ipEnrolleeDevice.setIpAddr(ipAddr);
             ipEnrolleeDevice.setHWAddr(macAddr);
             if (isReachable) {

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 bab8c05..46b5564 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
@@ -143,7 +143,7 @@ JNIEXPORT void JNICALL JNIProvisionEnrollee(JNIEnv *env, jobject thisObj,
     strncpy(netInfo.netAddressInfo.WIFI.ipAddress, ipAddress, IPV4_ADDR_SIZE);\r
     strncpy(netInfo.netAddressInfo.WIFI.ssid, netSSID, NET_WIFI_SSID_SIZE);\r
     strncpy(netInfo.netAddressInfo.WIFI.pwd, netPWD, NET_WIFI_PWD_SIZE);\r
-    netInfo.connType = OCConnectivityType::CT_ADAPTER_IP;\r
+    netInfo.connType = (OCConnectivityType)jConnectivityType;\r
     netInfo.isSecured = true;\r
 \r
     ProvisionEnrollee(&netInfo);\r