Merge tizen_5.0 codes into tizen_4.0

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

diff --git a/android/android_api/base/jni/JniOnGetListener.h b/android/android_api/base/jni/JniOnGetListener.h
index abffaa0..09b4d7b 100644 (file)
--- a/android/android_api/base/jni/JniOnGetListener.h
+++ b/android/android_api/base/jni/JniOnGetListener.h
@@ -26,27 +26,17 @@
 
 using namespace OC;
 
-class JniOcResource;
-#ifdef WITH_CLOUD
-class JniOcAccountManager;
-#endif
-
 class JniOnGetListener
 {
 public:
-    JniOnGetListener(JNIEnv *env, jobject listener, JniOcResource* resource);
-#ifdef WITH_CLOUD
-    JniOnGetListener(JNIEnv *env, jobject listener, JniOcAccountManager* resource);
-#endif
+
+    JniOnGetListener(JNIEnv *env, jobject listener, RemoveListenerCallback removeListener);
     ~JniOnGetListener();
     void onGetCallback(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode);
 
 private:
     jweak m_jwListener;
-    JniOcResource* m_ownerResource;
-#ifdef WITH_CLOUD
-    JniOcAccountManager* m_ownerAccountManager;
-#endif
+    RemoveListenerCallback m_removeListener;
     void checkExAndRemoveListener(JNIEnv *env);
 };