From: Sunil Kumar K R Date: Wed, 21 Dec 2016 06:07:23 +0000 (+0530) Subject: Cloud provisioning modification in listener return type. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=716617dcb37276b77dfdd217c7b12e8076670a9d;p=contrib%2Fiotivity.git Cloud provisioning modification in listener return type. patch2: Cloud provisioning Listener modification patch3: Signout bug fix Change-Id: Ibf43255ff82891b3ef7026763b5d2796fe839abf Signed-off-by: Sunil Kumar K R Reviewed-on: https://gerrit.iotivity.org/gerrit/15865 Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh Reviewed-on: https://gerrit.iotivity.org/gerrit/16415 Tested-by: jenkins-iotivity --- diff --git a/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java b/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java index b0305d1..fea2184 100755 --- a/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java +++ b/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java @@ -42,7 +42,7 @@ public class OcCloudProvisioning { /** * API to construct the CloudProvisioning * - * @param ip address of the cloud server + * @param ipAddr address of the cloud server * @param port port of the cloud server */ public OcCloudProvisioning(String ip, int port) { @@ -63,23 +63,23 @@ public class OcCloudProvisioning { } public interface RequestCertificateListener { - public void requestCertificateListener(boolean result); + public void requestCertificateListener(int result); } public interface GetAclIdByDeviceListener { - public void getAclIdByDeviceListener(boolean result,String aclId); + public void getAclIdByDeviceListener(int result, String aclId); } public interface GetIndividualAclInfoListener { - public void getIndividualAclInfoListener(boolean result); + public void getIndividualAclInfoListener(int result); } public interface GetCRLListener { - public void getCRLListener(boolean result); + public void getCRLListener(int result); } public interface PostCRLListener { - public void postCRLListener(boolean result); + public void postCRLListener(int result); } /** diff --git a/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/CloudProvisioningClient.java b/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/CloudProvisioningClient.java index fbfcd71..3cdd820 100755 --- a/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/CloudProvisioningClient.java +++ b/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/CloudProvisioningClient.java @@ -182,9 +182,9 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage OcCloudProvisioning.GetIndividualAclInfoListener getIndividualAclInfoListener = new OcCloudProvisioning.GetIndividualAclInfoListener() { @Override - public void getIndividualAclInfoListener(boolean result) { + public void getIndividualAclInfoListener(int result) { Log.d(TAG, "Inside getIndividualAclInfoListener "); - if (!result) { + if (result == 0) { logMessage("Individual ACL Info Successfull !!"); } else { logMessage("Error: Individual ACL Info failed !!"); @@ -194,9 +194,9 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage OcCloudProvisioning.RequestCertificateListener requestCertificateListener = new OcCloudProvisioning.RequestCertificateListener() { @Override - public void requestCertificateListener(boolean result) { + public void requestCertificateListener(int result) { Log.d(TAG, "Inside requestCertificateListener "); - if (!result) { + if (result == 0) { logMessage("Request certificate Successfull !!"); } else { logMessage("Error: Request certificate failed !!"); @@ -206,9 +206,9 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage OcCloudProvisioning.GetCRLListener getCRLListener = new OcCloudProvisioning.GetCRLListener() { @Override - public void getCRLListener(boolean result) { + public void getCRLListener(int result) { Log.d(TAG, "Inside getCRLListener "); - if (!result) { + if (result == 0) { logMessage("Get CRL Successfull !!"); } else { logMessage("Error: Get CRL failed !!"); @@ -218,9 +218,9 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage OcCloudProvisioning.PostCRLListener postCRLListener = new OcCloudProvisioning.PostCRLListener() { @Override - public void postCRLListener(boolean result) { + public void postCRLListener(int result) { Log.d(TAG, "Inside postCRLListener "); - if (!result) { + if (result == 4) { logMessage("Post CRL Successfull !!"); } else { logMessage("Error: Post CRL failed !!"); @@ -239,9 +239,9 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage OcCloudProvisioning.GetAclIdByDeviceListener getAclIdByDeviceListener = new OcCloudProvisioning.GetAclIdByDeviceListener() { @Override - public void getAclIdByDeviceListener(boolean result, String aclId) { + public void getAclIdByDeviceListener(int result, String aclId) { Log.d(TAG, "Inside getAclIdByDeviceListener "); - if (!result) { + if (result == 0) { acl_Id = aclId; logMessage("Acl Id by device !!" + acl_Id); } else { @@ -288,6 +288,7 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage editor.putString("IP", StringConstants.DEFAULT_COAP_DERVER_IP); editor.putString("PORT", StringConstants.DEFAULT_COAP_DERVER_PORT); editor.putString("DEVICEID", StringConstants.DEFAULT_DEVICE_ID); + editor.putString("SERIALNUMBER", StringConstants.DEFAULT_SERIAL_NUMBER); editor.commit(); } if (settingPreference.getString("useruuid", "").equals("")) { @@ -455,7 +456,7 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage try { logMessage("postCrl"); ArrayList arrayList = new ArrayList<>(); - arrayList.add("1234"); + arrayList.add(settingPreference.getString("SERIALNUMBER", "1234")); ocCloudProvisioning.postCRL("20160727000000", "20161027000000", null, arrayList, postCRLListener); @@ -623,10 +624,12 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage final EditText ip = (EditText) setingLayout.findViewById(R.id.ip); final EditText port = (EditText) setingLayout.findViewById(R.id.port); final EditText deviceId = (EditText) setingLayout.findViewById(R.id.deviceId); + final EditText serialNum = (EditText) setingLayout.findViewById(R.id.serialNum); ip.setText(settingPreference.getString("IP", "")); port.setText(settingPreference.getString("PORT", "")); deviceId.setText(settingPreference.getString("DEVICEID", "")); + serialNum.setText(settingPreference.getString("SERIALNUMBER", "1234")); final AlertDialog.Builder builder = new AlertDialog.Builder(CloudProvisioningClient.this); @@ -647,12 +650,14 @@ public class CloudProvisioningClient extends Activity implements OcAccountManage String ip_address = ip.getText().toString(); String port_num = port.getText().toString(); String deviceId_val = deviceId.getText().toString(); + String serialNum_val = serialNum.getText().toString(); SharedPreferences.Editor editor = settingPreference.edit(); editor.putString("IP", ip_address); editor.putString("PORT", port_num); editor.putString("DEVICEID", deviceId_val); + editor.putString("SERIALNUMBER", serialNum_val); editor.commit(); alertDialog.cancel(); diff --git a/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/StringConstants.java b/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/StringConstants.java index 18c4974..7fb9e92 100755 --- a/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/StringConstants.java +++ b/java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/StringConstants.java @@ -24,6 +24,8 @@ package org.iotivity.base.examples.cloudprovisioningclient; public interface StringConstants { public static final String DEFAULT_DEVICE_ID = "9cfbeb8e-5a1e-4d1c-9d01-2ae6fdb"; + public static final String DEFAULT_SERIAL_NUMBER = "1234"; + public static final String COAP_TCP = "coap+tcp://"; public static final String DEFAULT_COAP_DERVER_IP = "107.109.229.111"; public static final String DEFAULT_COAP_DERVER_PORT = "5684"; diff --git a/java/examples-android/cloudprovisioningclient/src/main/res/layout/setting_layout.xml b/java/examples-android/cloudprovisioningclient/src/main/res/layout/setting_layout.xml index 8d6eab0..ae0cd57 100755 --- a/java/examples-android/cloudprovisioningclient/src/main/res/layout/setting_layout.xml +++ b/java/examples-android/cloudprovisioningclient/src/main/res/layout/setting_layout.xml @@ -66,4 +66,25 @@ - \ No newline at end of file + + + + + + + + + diff --git a/java/jni/JniGetAclIdByDeviceListener.cpp b/java/jni/JniGetAclIdByDeviceListener.cpp index c13682f..f6908ed 100644 --- a/java/jni/JniGetAclIdByDeviceListener.cpp +++ b/java/jni/JniGetAclIdByDeviceListener.cpp @@ -79,7 +79,7 @@ void JniGetAclIdByDeviceListener::GetAclIdByDeviceListenerCB(int result, std::st return; } - jmethodID midL = env->GetMethodID(clsL, "getAclIdByDeviceListener", "(ZLjava/lang/String;)V"); + jmethodID midL = env->GetMethodID(clsL, "getAclIdByDeviceListener", "(ILjava/lang/String;)V"); if (!midL) { checkExAndRemoveListener(env); @@ -100,7 +100,7 @@ void JniGetAclIdByDeviceListener::GetAclIdByDeviceListenerCB(int result, std::st return; } - env->CallVoidMethod(jListener, midL, (jboolean)result, jStr); + env->CallVoidMethod(jListener, midL, (jint)result, jStr); if (env->ExceptionCheck()) { LOGE("Java exception is thrown"); diff --git a/java/jni/JniOcAccountManager.h b/java/jni/JniOcAccountManager.h index 9eb3fee..48baf1a 100644 --- a/java/jni/JniOcAccountManager.h +++ b/java/jni/JniOcAccountManager.h @@ -146,10 +146,10 @@ extern "C" { /* * Class: org_iotivity_base_OcAccountManager * Method: signOut0 - * Signature: (Lorg/iotivity/base/OcAccountManager/OnPostListener;)V + * Signature: (Ljava/lang/String;Lorg/iotivity/base/OcAccountManager/OnPostListener;)V */ JNIEXPORT void JNICALL Java_org_iotivity_base_OcAccountManager_signOut0 - (JNIEnv *, jobject, jobject); + (JNIEnv *, jobject, jstring, jobject); /* * Class: org_iotivity_base_OcAccountManager diff --git a/java/jni/JniOcCloudResultListener.cpp b/java/jni/JniOcCloudResultListener.cpp index 250dd5b..b952e61 100644 --- a/java/jni/JniOcCloudResultListener.cpp +++ b/java/jni/JniOcCloudResultListener.cpp @@ -114,7 +114,7 @@ void JniOcCloudResultListener::CloudResultListenerCB(int result, void *data, } } - jmethodID midL = env->GetMethodID(clsL, calledFunc.c_str(), "(Z)V"); + jmethodID midL = env->GetMethodID(clsL, calledFunc.c_str(), "(I)V"); if (!midL) { checkExAndRemoveListener(env); @@ -125,7 +125,7 @@ void JniOcCloudResultListener::CloudResultListenerCB(int result, void *data, return; } - env->CallVoidMethod(jListener, midL, (jboolean)result); + env->CallVoidMethod(jListener, midL, result); if (env->ExceptionCheck()) { LOGE("Java exception is thrown");