Update certificate-provisioin & acl-provision

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / android / EasySetupCore / src / main / jni / JniRemoteEnrollee.cpp

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniRemoteEnrollee.cpp b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniRemoteEnrollee.cpp
index 458bb4d..851aeab 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniRemoteEnrollee.cpp
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniRemoteEnrollee.cpp
@@ -157,6 +157,7 @@ void JniRemoteEnrollee::provisionDeviceProperties(JNIEnv *env,
 void JniRemoteEnrollee::provisionCloudProperties(JNIEnv *env,
                                                 jobject jRepresentation,
                                                 jstring jCloudID,
+                                                jint jCredID,
                                                 jobject jListener)
 {
     OCRepresentation *representation = JniOcRepresentation::getOCRepresentationPtr(env, jRepresentation);
@@ -164,9 +165,14 @@ void JniRemoteEnrollee::provisionCloudProperties(JNIEnv *env,
     {
         return;
     }
+    if (!jCloudID)
+    {
+        return;
+    }
 
     CloudProp cloudProp(*representation);
     cloudProp.setCloudID(env->GetStringUTFChars(jCloudID, NULL));
+    cloudProp.setCredID(jCredID);
 
     JniCloudPropProvisioningStatusListener *onCloudPropProvisioningStatusReceived =
                     addStatusListener<JniCloudPropProvisioningStatusListener>(env, jListener);
@@ -242,12 +248,12 @@ Java_org_iotivity_service_easysetup_mediator_RemoteEnrollee_nativeProvisionDevic
 
 JNIEXPORT void JNICALL
 Java_org_iotivity_service_easysetup_mediator_RemoteEnrollee_nativeProvisionCloudProperties
-(JNIEnv *env, jobject jClass, jobject jRepresentation, jstring jCloudID, jobject jListener)
+(JNIEnv *env, jobject jClass, jobject jRepresentation, jstring jCloudID, jint jCredID, jobject jListener)
 {
     ES_LOGD("nativeprovisionCloudProperties Enter");
 
     JniRemoteEnrollee *remoteEnrollee = JniRemoteEnrollee::getJniRemoteEnrollee(env, jClass);
-    remoteEnrollee->provisionCloudProperties(env, jRepresentation, jCloudID, jListener);
+    remoteEnrollee->provisionCloudProperties(env, jRepresentation, jCloudID, jCredID, jListener);
 
     ES_LOGD("nativeprovisionCloudProperties Exit");
 }