Merge tizen_5.0 codes into tizen_4.0

[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOnDeleteListener.h

diff --git a/android/android_api/base/jni/JniOnDeleteListener.h b/android/android_api/base/jni/JniOnDeleteListener.h
index 9354232..4a2be30 100644 (file)
--- a/android/android_api/base/jni/JniOnDeleteListener.h
+++ b/android/android_api/base/jni/JniOnDeleteListener.h
@@ -26,28 +26,18 @@
 
 using namespace OC;
 
-class JniOcResource;
-#ifdef WITH_CLOUD
-class JniOcAccountManager;
-#endif
-
 class JniOnDeleteListener
 {
 public:
-    JniOnDeleteListener(JNIEnv *env, jobject jListener, JniOcResource* owner);
-#ifdef WITH_CLOUD
-    JniOnDeleteListener(JNIEnv *env, jobject jListener, JniOcAccountManager* owner);
-#endif
+
+    JniOnDeleteListener(JNIEnv *env, jobject jListener, RemoveListenerCallback removeListener);
     ~JniOnDeleteListener();
 
     void onDeleteCallback(const HeaderOptions&, const int eCode);
 
 private:
     jweak m_jwListener;
-    JniOcResource* m_ownerResource;
-#ifdef WITH_CLOUD
-    JniOcAccountManager* m_ownerAccountManager;
-#endif
+    RemoveListenerCallback m_removeListener;
     void checkExAndRemoveListener(JNIEnv *env);
 };