Updated ESResult which supports more detail on Android layer.

 - The patch is associated with "https://gerrit.iotivity.org/gerrit/#/c/11947/"

Change-Id: I9e20fbccef12678c6f70a27e167ac2d7fdff9b00
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit e686b0a24f0f4586646c7054b0ddb8a4fcb9fe09)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12527

diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript
index 4314a5e..af54740 100644 (file)
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@ -95,8 +95,7 @@ if target_os in ['android','linux']:
                env.get('SRC_DIR') + '/resource/csdk/security/include',
                env.get('SRC_DIR') + '/extlibs/cjson',
                env.get('SRC_DIR') + '/extlibs/sqlite3',
-               env.get('SRC_DIR') + '/service/easy-setup/inc',
-               'inc'])
+               env.get('SRC_DIR') + '/service/easy-setup/inc'])
        if env.get('SECURED') == '1':
                with_upstream_libcoap = easy_setup_env.get('WITH_UPSTREAM_LIBCOAP')
                if with_upstream_libcoap == '1':
@@ -110,8 +109,8 @@ if target_os in ['android','linux']:
                        env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include',
                        env.get('SRC_DIR') + '/resource/csdk/security/include/internal',
                        env.get('SRC_DIR') + '/resource/csdk/connectivity/api/',
-            env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal',
-            env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/cloud',
+                       env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal',
+                       env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/cloud',
                        env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/oxm'])
                if env.get('WITH_TCP') == True:
                        easy_setup_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/enums/ESResult.java b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/enums/ESResult.java
index 0db25af..fce3537 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/enums/ESResult.java
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/enums/ESResult.java
@@ -26,11 +26,13 @@ package org.iotivity.service.easysetup.mediator.enums;
 public enum ESResult {
 
     ES_OK(0),
-    ES_FOUND_ENROLLEE(1),
-    ES_NOT_FOUND_ENROLLEE(11),
+    ES_ENROLLEE_DISCOVERY_FAILURE(11),
+    ES_COMMUNICATION_ERROR(12),
     ES_SEC_OPERATION_IS_NOT_SUPPORTED(20),
-    ES_UNAUTHORIZED_REQ(21),
-    ES_SEC_PROVISION_FAILS(22),
+    ES_SECURE_RESOURCE_DISCOVERY_FAILURE(21),
+    ES_OWNERSHIP_TRANSFER_FAILURE(22),
+    ES_ACL_PROVISIONING_FAILURE(23),
+    ES_CERT_PROVISIONING_FAILURE(24),
     ES_ERROR(255);
 
     private int value;

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/EasysetupActivity.java b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/EasysetupActivity.java
index 98758ee..6d46948 100755 (executable)
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/EasysetupActivity.java
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/EasysetupActivity.java
@@ -510,6 +510,26 @@ public class EasysetupActivity extends Activity
                                             }
                                         });
                                     }
+                                    else if(securityProvisioningStatus.getESResult()
+                                            == ESResult.ES_SECURE_RESOURCE_DISCOVERY_FAILURE) {
+                                        runOnUiThread(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                mSecStateText.setText("Not found Secure Resource");
+                                                mStartConfigureSec.setEnabled(true);
+                                            }
+                                        });
+                                    }
+                                    else if(securityProvisioningStatus.getESResult()
+                                            == ESResult.ES_OWNERSHIP_TRANSFER_FAILURE) {
+                                        runOnUiThread(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                mSecStateText.setText("Ownership transfer failed");
+                                                mStartConfigureSec.setEnabled(true);
+                                            }
+                                        });
+                                    }
                                     else {
                                         runOnUiThread(new Runnable() {
                                             @Override
@@ -558,7 +578,6 @@ public class EasysetupActivity extends Activity
                                 @Override
                                 public void onProgress(GetConfigurationStatus getConfigurationStatus) {
                                     if(getConfigurationStatus.getESResult() == ESResult.ES_OK) {
-
                                         final EnrolleeConf enrolleeConf = getConfigurationStatus.getEnrolleeConf();
                                         runOnUiThread(new Runnable() {
                                             @Override
@@ -577,7 +596,16 @@ public class EasysetupActivity extends Activity
                                                 }
                                             }
                                         });
-
+                                    }
+                                    else if(getConfigurationStatus.getESResult() == ESResult.ES_COMMUNICATION_ERROR)
+                                    {
+                                        runOnUiThread(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                mGetconfigurationStateText.setText("Communication Error");
+                                                mStartGetConfiguration.setEnabled(true);
+                                            }
+                                        });
                                     }
                                     else {
                                         runOnUiThread(new Runnable() {
@@ -651,8 +679,8 @@ public class EasysetupActivity extends Activity
                                             else if(result.equals(ESResult.ES_ERROR)) {
                                                 mProvisionDevPropState.setText("Failed");
                                             }
-                                            else if(result.equals(ESResult.ES_UNAUTHORIZED_REQ)) {
-                                                mProvisionDevPropState.setText("Failed. Need SecProv");
+                                            else if(result.equals(ESResult.ES_COMMUNICATION_ERROR)) {
+                                                mProvisionDevPropState.setText("Communication Error");
                                             }
                                             mStartProvisionDevProp.setEnabled(true);
                                         }
@@ -709,15 +737,21 @@ public class EasysetupActivity extends Activity
                                     runOnUiThread(new Runnable() {
                                         @Override
                                         public void run() {
-                                            if(result.equals(ESResult.ES_FOUND_ENROLLEE)) {
-                                                mProvisionCloudPropState.setText("Found Resource");
-                                            }
-                                            else if(result.equals(ESResult.ES_NOT_FOUND_ENROLLEE)) {
+                                            if(result.equals(ESResult.ES_ENROLLEE_DISCOVERY_FAILURE)) {
                                                 mProvisionCloudPropState.setText("Not Found Resource");
                                             }
                                             else if(result.equals(ESResult.ES_OK)) {
                                                 mProvisionCloudPropState.setText("Cloud Provisioning succeeds");
                                             }
+                                            else if(result.equals(ESResult.ES_ACL_PROVISIONING_FAILURE)){
+                                                mProvisionCloudPropState.setText("ACL-provisioning fails");
+                                            }
+                                            else if(result.equals(ESResult.ES_CERT_PROVISIONING_FAILURE)){
+                                                mProvisionCloudPropState.setText("CERT-provisioning fails");
+                                            }
+                                            else if(result.equals(ESResult.ES_COMMUNICATION_ERROR)){
+                                                mProvisionCloudPropState.setText("Communication Error");
+                                            }
                                             else {
                                                 mProvisionCloudPropState.setText("Cloud Provisioning fails");
                                             }