Fix the issue of unreleased JNI references. (#23655)

amitnj · restyled-commits · pull[bot] · commit 1431590c50ca · 2023-08-18T17:42:17.000Z
* Fix the issue of unreleased JNI references.

* Restyled by clang-format

Co-authored-by: Restyled.io &lt;commits@restyled.io&gt;
diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp
@@ -85,25 +85,27 @@ CHIP_ERROR AppContentLauncherManager::HandleGetAcceptHeaderList(AttributeValueEn
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList");
     chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,
                                                chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);
-    const char * resStr = mAttributeDelegate->Read(aPath);
-    ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr);
+    std::string resStr = mAttributeDelegate->Read(aPath);
+    ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response %s", resStr.c_str());
 
-    if (resStr != nullptr && *resStr != 0)
+    if (resStr.length() != 0)
     {
         Json::Reader reader;
         Json::Value value;
         if (reader.parse(resStr, value))
         {
             std::string attrId = to_string(chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);
-            ChipLogProgress(
-                Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response parsing done. reading attr %s",
-                attrId.c_str());
+            ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response parsing done. reading attr %s",
+                            attrId.c_str());
             if (value[attrId].isArray())
             {
                 mAcceptHeaderList.clear();
                 for (Json::Value & entry : value[attrId])
                 {
-                    mAcceptHeaderList.push_back(entry.asString());
+                    if (entry.isString())
+                    {
+                        mAcceptHeaderList.push_back(entry.asString());
+                    }
                 }
             }
         }
@@ -124,10 +126,10 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols");
     chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,
                                                chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);
-    const char * resStr = mAttributeDelegate->Read(aPath);
-    ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr);
+    std::string resStr = mAttributeDelegate->Read(aPath);
+    ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr.c_str());
 
-    if (resStr == nullptr || *resStr == 0)
+    if (resStr.length() == 0)
     {
         return mSupportedStreamingProtocols;
     }
@@ -141,7 +143,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()
     std::string attrId = to_string(chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);
     ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response parsing done. reading attr %s",
                     attrId.c_str());
-    if (!value[attrId].empty())
+    if (!value[attrId].empty() && value[attrId].isInt())
     {
         uint32_t supportedStreamingProtocols = static_cast<uint32_t>(value[attrId].asInt());
         mSupportedStreamingProtocols         = supportedStreamingProtocols;
diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp
@@ -130,11 +130,11 @@ uint64_t AppMediaPlaybackManager::HandleMediaRequestGetAttribute(chip::Attribute
 {
     ChipLogProgress(Zcl, "Received AppMediaPlaybackManager::HandleMediaRequestGetAttribute:%d", attributeId);
     chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::MediaPlayback::Id, attributeId);
-    const char * resStr = mAttributeDelegate->Read(aPath);
-    ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response %s", resStr);
+    std::string resStr = mAttributeDelegate->Read(aPath);
+    ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response %s", resStr.c_str());
 
     uint64_t ret = std::numeric_limits<uint64_t>::max();
-    if (resStr != nullptr && *resStr != 0)
+    if (resStr.length() != 0)
     {
         Json::Reader reader;
         Json::Value value;
@@ -143,7 +143,7 @@ uint64_t AppMediaPlaybackManager::HandleMediaRequestGetAttribute(chip::Attribute
             std::string attrId = to_string(attributeId);
             ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleMediaRequestGetAttribute response parsing done. reading attr %s",
                             attrId.c_str());
-            if (!value[attrId].empty())
+            if (!value[attrId].empty() && value[attrId].isUInt())
             {
                 ret = static_cast<uint64_t>(value[attrId].asUInt());
                 return ret;
@@ -177,9 +177,10 @@ CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncod
     ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleGetSampledPosition");
     chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::MediaPlayback::Id,
                                                chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::Id);
-    const char * resStr = mAttributeDelegate->Read(aPath);
+    std::string resStr = mAttributeDelegate->Read(aPath);
+    ChipLogProgress(Zcl, "AppMediaPlaybackManager::HandleGetSampledPosition response %s", resStr.c_str());
 
-    if (resStr != nullptr && *resStr != 0)
+    if (resStr.length() != 0)
     {
         Json::Reader reader;
         Json::Value value;
@@ -188,13 +189,14 @@ CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncod
             std::string attrId = to_string(chip::app::Clusters::MediaPlayback::Attributes::SampledPosition::Id);
             ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSampledPosition response parsing done. reading attr %s",
                             attrId.c_str());
-            if (!value[attrId].empty())
+            if (!value[attrId].empty() && value[attrId].isObject())
             {
                 std::string updatedAt = to_string(
                     static_cast<uint32_t>(chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Fields::kUpdatedAt));
                 std::string position = to_string(
                     static_cast<uint32_t>(chip::app::Clusters::MediaPlayback::Structs::PlaybackPosition::Fields::kPosition));
-                if (!value[attrId][updatedAt].empty() && !value[attrId][position].empty())
+                if (!value[attrId][updatedAt].empty() && !value[attrId][position].empty() && value[attrId][updatedAt].isUInt() &&
+                    value[attrId][position].isUInt())
                 {
                     // valid response
                     response.updatedAt = value[attrId][updatedAt].asUInt();
diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
@@ -39,10 +39,10 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a
     {
         chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id,
                                                    chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
-        const char * resStr = mAttributeDelegate->Read(aPath);
-        ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response %s", resStr);
+        std::string resStr = mAttributeDelegate->Read(aPath);
+        ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response %s", resStr.c_str());
 
-        if (resStr != nullptr && *resStr != 0)
+        if (resStr.length() != 0)
         {
             Json::Reader reader;
             Json::Value value;
@@ -104,10 +104,10 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget()
     {
         chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id,
                                                    chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
-        const char * resStr = mAttributeDelegate->Read(aPath);
-        ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response %s", resStr);
+        std::string resStr = mAttributeDelegate->Read(aPath);
+        ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response %s", resStr.c_str());
 
-        if (resStr != nullptr && *resStr != 0)
+        if (resStr.length() != 0)
         {
             Json::Reader reader;
             Json::Value value;
diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp b/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
@@ -34,14 +34,15 @@ namespace AppPlatform {
 
 using LaunchResponseType = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
 
-const char * ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttributePath & aPath)
+std::string ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttributePath & aPath)
 {
     if (aPath.mEndpointId < FIXED_ENDPOINT_COUNT)
     {
+        // returning blank string causes the caller to default to output required by the tests
         return "";
     }
-    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
 
+    JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     ChipLogProgress(Zcl, "ContentAppAttributeDelegate::Read being called for endpoint %d cluster %d attribute %d",
                     aPath.mEndpointId, aPath.mClusterId, aPath.mAttributeId);
 
@@ -53,11 +54,15 @@ const char * ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttr
         ChipLogError(Zcl, "Java exception in ContentAppAttributeDelegate::Read");
         env->ExceptionDescribe();
         env->ExceptionClear();
+        // returning blank string causes the caller to default to output required by the tests
         return "";
     }
     const char * respStr = env->GetStringUTFChars(resp, 0);
+    std::string retStr(respStr);
+    env->ReleaseStringUTFChars(resp, respStr);
+    env->DeleteLocalRef(resp);
     ChipLogProgress(Zcl, "ContentAppAttributeDelegate::Read got response %s", respStr);
-    return respStr;
+    return retStr;
 }
 
 } // namespace AppPlatform
diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.h b/examples/tv-app/android/java/ContentAppAttributeDelegate.h
@@ -51,7 +51,7 @@ class ContentAppAttributeDelegate
         env->DeleteGlobalRef(mContentAppEndpointManager);
     }
 
-    const char * Read(const chip::app::ConcreteReadAttributePath & aPath);
+    std::string Read(const chip::app::ConcreteReadAttributePath & aPath);
 
 private:
     void InitializeJNIObjects(jobject manager)
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -60,12 +60,12 @@ void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerCo
             return;
         }
 
-        JNIEnv * env      = JniReferences::GetInstance().GetEnvForCurrentThread();
-        Json::Value value = json["value"];
-        UtfString jsonString(env, JsonToString(value).c_str());
+        JNIEnv * env        = JniReferences::GetInstance().GetEnvForCurrentThread();
+        Json::Value value   = json["value"];
+        std::string payload = JsonToString(value);
+        UtfString jsonString(env, payload.c_str());
 
-        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand send command being called with payload %s",
-                        JsonToString(json).c_str());
+        ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand send command being called with payload %s", payload.c_str());
 
         jstring resp = (jstring) env->CallObjectMethod(
             mContentAppEndpointManager, mSendCommandMethod, static_cast<jint>(handlerContext.mRequestPath.mEndpointId),
@@ -82,6 +82,8 @@ void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerCo
         const char * respStr = env->GetStringUTFChars(resp, 0);
         ChipLogProgress(Zcl, "ContentAppCommandDelegate::InvokeCommand got response %s", respStr);
         FormatResponseData(handlerContext, respStr);
+        env->ReleaseStringUTFChars(resp, respStr);
+        env->DeleteLocalRef(resp);
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -85,25 +85,27 @@ CHIP_ERROR AppContentLauncherManager::HandleGetAcceptHeaderList(AttributeValueEn`
`85`	`85`	`ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList");`
`86`	`86`	`chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,`
`87`	`87`	`chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);`
`88`		`- const char * resStr = mAttributeDelegate->Read(aPath);`
`89`		`- ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr);`
	`88`	`+ std::string resStr = mAttributeDelegate->Read(aPath);`
	`89`	`+ ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response %s", resStr.c_str());`
`90`	`90`
`91`		`- if (resStr != nullptr && *resStr != 0)`
	`91`	`+ if (resStr.length() != 0)`
`92`	`92`	`{`
`93`	`93`	`Json::Reader reader;`
`94`	`94`	`Json::Value value;`
`95`	`95`	`if (reader.parse(resStr, value))`
`96`	`96`	`{`
`97`	`97`	`std::string attrId = to_string(chip::app::Clusters::ContentLauncher::Attributes::AcceptHeader::Id);`
`98`		`- ChipLogProgress(`
`99`		`- Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response parsing done. reading attr %s",`
`100`		`- attrId.c_str());`
	`98`	`+ ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetAcceptHeaderList response parsing done. reading attr %s",`
	`99`	`+ attrId.c_str());`
`101`	`100`	`if (value[attrId].isArray())`
`102`	`101`	`{`
`103`	`102`	`mAcceptHeaderList.clear();`
`104`	`103`	`for (Json::Value & entry : value[attrId])`
`105`	`104`	`{`
`106`		`- mAcceptHeaderList.push_back(entry.asString());`
	`105`	`+ if (entry.isString())`
	`106`	`+ {`
	`107`	`+ mAcceptHeaderList.push_back(entry.asString());`
	`108`	`+ }`
`107`	`109`	`}`
`108`	`110`	`}`
`109`	`111`	`}`
`@@ -124,10 +126,10 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()`
`124`	`126`	`ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols");`
`125`	`127`	`chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::ContentLauncher::Id,`
`126`	`128`	`chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);`
`127`		`- const char * resStr = mAttributeDelegate->Read(aPath);`
`128`		`- ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr);`
	`129`	`+ std::string resStr = mAttributeDelegate->Read(aPath);`
	`130`	`+ ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response %s", resStr.c_str());`
`129`	`131`
`130`		`- if (resStr == nullptr \|\| *resStr == 0)`
	`132`	`+ if (resStr.length() == 0)`
`131`	`133`	`{`
`132`	`134`	`return mSupportedStreamingProtocols;`
`133`	`135`	`}`
`@@ -141,7 +143,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols()`
`141`	`143`	`std::string attrId = to_string(chip::app::Clusters::ContentLauncher::Attributes::SupportedStreamingProtocols::Id);`
`142`	`144`	`ChipLogProgress(Zcl, "AppContentLauncherManager::HandleGetSupportedStreamingProtocols response parsing done. reading attr %s",`
`143`	`145`	`attrId.c_str());`
`144`		`- if (!value[attrId].empty())`
	`146`	`+ if (!value[attrId].empty() && value[attrId].isInt())`
`145`	`147`	`{`
`146`	`148`	`uint32_t supportedStreamingProtocols = static_cast<uint32_t>(value[attrId].asInt());`
`147`	`149`	`mSupportedStreamingProtocols = supportedStreamingProtocols;`
Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,15 @@ namespace AppPlatform {`
`34`	`34`
`35`	`35`	`using LaunchResponseType = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;`
`36`	`36`
`37`		`-const char * ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttributePath & aPath)`
	`37`	`+std::string ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttributePath & aPath)`
`38`	`38`	`{`
`39`	`39`	`if (aPath.mEndpointId < FIXED_ENDPOINT_COUNT)`
`40`	`40`	`{`
	`41`	`+ // returning blank string causes the caller to default to output required by the tests`
`41`	`42`	`return "";`
`42`	`43`	`}`
`43`		`- JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();`
`44`	`44`
	`45`	`+ JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();`
`45`	`46`	`ChipLogProgress(Zcl, "ContentAppAttributeDelegate::Read being called for endpoint %d cluster %d attribute %d",`
`46`	`47`	`aPath.mEndpointId, aPath.mClusterId, aPath.mAttributeId);`
`47`	`48`
`@@ -53,11 +54,15 @@ const char * ContentAppAttributeDelegate::Read(const chip::app::ConcreteReadAttr`
`53`	`54`	`ChipLogError(Zcl, "Java exception in ContentAppAttributeDelegate::Read");`
`54`	`55`	`env->ExceptionDescribe();`
`55`	`56`	`env->ExceptionClear();`
	`57`	`+ // returning blank string causes the caller to default to output required by the tests`
`56`	`58`	`return "";`
`57`	`59`	`}`
`58`	`60`	`const char * respStr = env->GetStringUTFChars(resp, 0);`
	`61`	`+ std::string retStr(respStr);`
	`62`	`+ env->ReleaseStringUTFChars(resp, respStr);`
	`63`	`+ env->DeleteLocalRef(resp);`
`59`	`64`	`ChipLogProgress(Zcl, "ContentAppAttributeDelegate::Read got response %s", respStr);`
`60`		`- return respStr;`
	`65`	`+ return retStr;`
`61`	`66`	`}`
`62`	`67`
`63`	`68`	`} // namespace AppPlatform`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class ContentAppAttributeDelegate`
`51`	`51`	`env->DeleteGlobalRef(mContentAppEndpointManager);`
`52`	`52`	`}`
`53`	`53`
`54`		`- const char * Read(const chip::app::ConcreteReadAttributePath & aPath);`
	`54`	`+ std::string Read(const chip::app::ConcreteReadAttributePath & aPath);`
`55`	`55`
`56`	`56`	`private:`
`57`	`57`	`void InitializeJNIObjects(jobject manager)`