X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fjni%2FJniOcPresenceHandle.cpp;h=00f81a1a7707d41445ac15c72716e34367eda58b;hb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;hp=83950bc746142e22b8144bb868d0421814bed568;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git diff --git a/android/android_api/base/jni/JniOcPresenceHandle.cpp b/android/android_api/base/jni/JniOcPresenceHandle.cpp index 83950bc..00f81a1 100644 --- a/android/android_api/base/jni/JniOcPresenceHandle.cpp +++ b/android/android_api/base/jni/JniOcPresenceHandle.cpp @@ -1,73 +1,73 @@ -/* -* //****************************************************************** -* // -* // Copyright 2015 Intel Corporation. -* // -* //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -* // -* // Licensed under the Apache License, Version 2.0 (the "License"); -* // you may not use this file except in compliance with the License. -* // You may obtain a copy of the License at -* // -* // http://www.apache.org/licenses/LICENSE-2.0 -* // -* // Unless required by applicable law or agreed to in writing, software -* // distributed under the License is distributed on an "AS IS" BASIS, -* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* // See the License for the specific language governing permissions and -* // limitations under the License. -* // -* //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -*/ -#include "JniOcPresenceHandle.h" -#include "OCPlatform.h" - -JniOcPresenceHandle::JniOcPresenceHandle(JniOnPresenceListener* jniListener, OCPresenceHandle presenceHandle) - : m_jniListener(jniListener), m_presenceHandle(presenceHandle) -{} - -JniOcPresenceHandle::~JniOcPresenceHandle() -{ - LOGD("~JniOcPresenceHandle()"); - - //delete m_jniListener; - m_presenceHandle = nullptr; -} - -JniOcPresenceHandle* JniOcPresenceHandle::getJniOcPresenceHandlePtr -(JNIEnv *env, jobject thiz) -{ - JniOcPresenceHandle *handle = GetHandle(env, thiz); - if (env->ExceptionCheck()) - { - LOGE("Failed to get native handle from OcPresenceHandle"); - } - if (!handle) - { - ThrowOcException(JNI_NO_NATIVE_POINTER, ""); - } - return handle; -} - -OCPresenceHandle JniOcPresenceHandle::getOCPresenceHandle() -{ - return this->m_presenceHandle; -} - -JniOnPresenceListener* JniOcPresenceHandle::getJniOnPresenceListener() -{ - return this->m_jniListener; -} - -/* -* Class: org_iotivity_base_OcPresenceHandle -* Method: dispose -* Signature: ()V -*/ -JNIEXPORT void JNICALL Java_org_iotivity_base_OcPresenceHandle_dispose -(JNIEnv *env, jobject thiz) -{ - LOGD("OcPresenceHandle_dispose"); - JniOcPresenceHandle *presenceHandle = JniOcPresenceHandle::getJniOcPresenceHandlePtr(env, thiz); - delete presenceHandle; +/* +* //****************************************************************** +* // +* // Copyright 2015 Intel Corporation. +* // +* //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +* // +* // Licensed under the Apache License, Version 2.0 (the "License"); +* // you may not use this file except in compliance with the License. +* // You may obtain a copy of the License at +* // +* // http://www.apache.org/licenses/LICENSE-2.0 +* // +* // Unless required by applicable law or agreed to in writing, software +* // distributed under the License is distributed on an "AS IS" BASIS, +* // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* // See the License for the specific language governing permissions and +* // limitations under the License. +* // +* //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +*/ +#include "JniOcPresenceHandle.h" +#include "OCPlatform.h" + +JniOcPresenceHandle::JniOcPresenceHandle(JniOnPresenceListener* jniListener, OCPresenceHandle presenceHandle) + : m_jniListener(jniListener), m_presenceHandle(presenceHandle) +{} + +JniOcPresenceHandle::~JniOcPresenceHandle() +{ + LOGD("~JniOcPresenceHandle()"); + + //delete m_jniListener; + m_presenceHandle = nullptr; +} + +JniOcPresenceHandle* JniOcPresenceHandle::getJniOcPresenceHandlePtr +(JNIEnv *env, jobject thiz) +{ + JniOcPresenceHandle *handle = GetHandle(env, thiz); + if (env->ExceptionCheck()) + { + LOGE("Failed to get native handle from OcPresenceHandle"); + } + if (!handle) + { + ThrowOcException(JNI_NO_NATIVE_POINTER, ""); + } + return handle; +} + +OCPresenceHandle JniOcPresenceHandle::getOCPresenceHandle() +{ + return this->m_presenceHandle; +} + +JniOnPresenceListener* JniOcPresenceHandle::getJniOnPresenceListener() +{ + return this->m_jniListener; +} + +/* +* Class: org_iotivity_base_OcPresenceHandle +* Method: dispose +* Signature: ()V +*/ +JNIEXPORT void JNICALL Java_org_iotivity_base_OcPresenceHandle_dispose +(JNIEnv *env, jobject thiz) +{ + LOGD("OcPresenceHandle_dispose"); + JniOcPresenceHandle *presenceHandle = JniOcPresenceHandle::getJniOcPresenceHandlePtr(env, thiz); + delete presenceHandle; } \ No newline at end of file