From 7441cfd327718291a45ab735cd3feead6cabe2f8 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Fri, 15 Jul 2016 15:26:58 +0900 Subject: [PATCH] modified some params of connection state callback method of Android. it needs to modify some params after merge https://gerrit.iotivity.org/gerrit/#/c/9209/ Change-Id: I919acba1dde939921a9cd645d44942011d68231e Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/9411 Tested-by: jenkins-iotivity Reviewed-by: Jaehong Jo Reviewed-by: Jon A. Cruz --- android/android_api/base/jni/JniCaInterface.c | 17 +++++++++++------ android/android_api/base/jni/JniCaInterface.h | 3 +-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/android/android_api/base/jni/JniCaInterface.c b/android/android_api/base/jni/JniCaInterface.c index e8649ec..bf52544 100644 --- a/android/android_api/base/jni/JniCaInterface.c +++ b/android/android_api/base/jni/JniCaInterface.c @@ -60,12 +60,14 @@ Java_org_iotivity_ca_CaInterface_initialize CANativeJNISetContext(env, context); } -void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter, - const char *remote_address, +void CAManagerConnectionStateChangedCB(const CAEndpoint_t *info, bool connected) { - LOGI("Callback - CAManagerConnectionStateChangedCB : type(%d), address(%s), connected(%d)", - adapter, remote_address, connected); + if (!info) + { + LOGE("info is NULL"); + return; + } if (!g_listenerObject) { @@ -73,6 +75,9 @@ void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter, return; } + LOGI("Callback - CAManagerConnectionStateChangedCB : type(%d), address(%s), connected(%d)", + info->adapter, info->addr, connected); + bool isAttached = false; JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); @@ -106,7 +111,7 @@ void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter, goto exit_error; } - jstring jni_address = (*env)->NewStringUTF(env, remote_address); + jstring jni_address = (*env)->NewStringUTF(env, info->addr); if (!jni_address) { LOGE("jni_address is null"); @@ -129,7 +134,7 @@ void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter, } jobject jni_adaptertype = (*env)->CallStaticObjectMethod(env, jni_cls_enum, - jni_mid_enum, adapter); + jni_mid_enum, info->adapter); (*env)->CallVoidMethod(env, g_listenerObject, jni_mid_listener, jni_adaptertype, jni_address, (jboolean)connected); diff --git a/android/android_api/base/jni/JniCaInterface.h b/android/android_api/base/jni/JniCaInterface.h index 9861eb8..2e8ba5b 100644 --- a/android/android_api/base/jni/JniCaInterface.h +++ b/android/android_api/base/jni/JniCaInterface.h @@ -31,8 +31,7 @@ extern "C" { #endif - void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter, - const char *remote_address, bool connected); + void CAManagerConnectionStateChangedCB(const CAEndpoint_t *info, bool connected); void CAManagerAdapterStateChangedCB(CATransportAdapter_t adapter, bool enabled); -- 2.7.4