Imported Upstream version 1.2.0

[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOnDPDevicesFoundListener.cpp

diff --git a/android/android_api/base/jni/JniOnDPDevicesFoundListener.cpp b/android/android_api/base/jni/JniOnDPDevicesFoundListener.cpp
index 5c5d900..a0ffd05 100644 (file)
--- a/android/android_api/base/jni/JniOnDPDevicesFoundListener.cpp
+++ b/android/android_api/base/jni/JniOnDPDevicesFoundListener.cpp
@@ -77,26 +77,38 @@ JniOnDPDevicesFoundListener::~JniOnDPDevicesFoundListener()
     LOGI("~JniOnDPDevicesFoundListener()");
     if (m_jwListener)
     {
-        jint ret;
+        jint ret = JNI_ERR;
         JNIEnv *env = GetJNIEnv(ret);
-        if (nullptr == env) return;
+        if (nullptr == env)
+        {
+            return;
+        }
         env->DeleteWeakGlobalRef(m_jwListener);
         m_jwListener = nullptr;
-        if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
+        if (JNI_EDETACHED == ret)
+        {
+            g_jvm->DetachCurrentThread();
+        }
     }
 }
 
 void JniOnDPDevicesFoundListener::directPairingDevicesCallback(PairedDevices paringDevicesList, DPFunc func)
 {
-    jint ret;
+    jint ret = JNI_ERR;
     JNIEnv *env = GetJNIEnv(ret);
-    if (nullptr == env) return;
+    if (nullptr == env)
+    {
+        return;
+    }
 
     jobject jListener = env->NewLocalRef(m_jwListener);
     if (!jListener)
     {
         checkExAndRemoveListener(env);
-        if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
+        if (JNI_EDETACHED == ret)
+        {
+            g_jvm->DetachCurrentThread();
+        }
         return;
     }
 
@@ -105,7 +117,10 @@ void JniOnDPDevicesFoundListener::directPairingDevicesCallback(PairedDevices par
     if (!clsL)
     {
         checkExAndRemoveListener(env);
-        if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
+        if (JNI_EDETACHED == ret)
+        {
+            g_jvm->DetachCurrentThread();
+        }
         return;
     }
 
@@ -122,10 +137,14 @@ void JniOnDPDevicesFoundListener::directPairingDevicesCallback(PairedDevices par
             {
                 calledFunc = "onGetDirectPairedListener";
             }
+            break;
         default:
             {
                 checkExAndRemoveListener(env);
-                if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
+                if (JNI_EDETACHED == ret)
+                {
+                    g_jvm->DetachCurrentThread();
+                }
             }
             return;
     }
@@ -135,7 +154,10 @@ void JniOnDPDevicesFoundListener::directPairingDevicesCallback(PairedDevices par
     if (!midL)
     {
         checkExAndRemoveListener(env);
-        if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
+        if (JNI_EDETACHED == ret)
+        {
+            g_jvm->DetachCurrentThread();
+        }
         return;
     }
 
@@ -146,7 +168,10 @@ void JniOnDPDevicesFoundListener::directPairingDevicesCallback(PairedDevices par
     }
 
     checkExAndRemoveListener(env);
-    if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
+    if (JNI_EDETACHED == ret)
+    {
+        g_jvm->DetachCurrentThread();
+    }
 }
 
 void JniOnDPDevicesFoundListener::checkExAndRemoveListener(JNIEnv* env)