fix string delete error in channel cluster (#16831)

xylophone21 · pull[bot] · commit 126191843479 · 2022-04-15T22:23:04.000Z
* fix string delete error in channel cluster

* fix restyled-io and ci errors
diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp
@@ -18,6 +18,7 @@
 #include "ChannelManager.h"
 #include "TvApp-JNI.h"
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <cstdlib>
 #include <jni.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/CHIPJNIError.h>
@@ -82,25 +83,25 @@ CHIP_ERROR ChannelManager::HandleGetChannelList(AttributeValueEncoder & aEncoder
 
             jfieldID getCallSignField = env->GetFieldID(channelClass, "callSign", "Ljava/lang/String;");
             jstring jcallSign         = static_cast<jstring>(env->GetObjectField(channelObject, getCallSignField));
-            if (jcallSign != NULL)
+            JniUtfString callsign(env, jcallSign);
+            if (jcallSign != nullptr)
             {
-                JniUtfString callsign(env, jcallSign);
                 channelInfo.callSign = Optional<CharSpan>(callsign.charSpan());
             }
 
             jfieldID getNameField = env->GetFieldID(channelClass, "name", "Ljava/lang/String;");
             jstring jname         = static_cast<jstring>(env->GetObjectField(channelObject, getNameField));
-            if (jname != NULL)
+            JniUtfString name(env, jname);
+            if (jname != nullptr)
             {
-                JniUtfString name(env, jname);
                 channelInfo.name = Optional<CharSpan>(name.charSpan());
             }
 
             jfieldID getJaffiliateCallSignField = env->GetFieldID(channelClass, "affiliateCallSign", "Ljava/lang/String;");
             jstring jaffiliateCallSign = static_cast<jstring>(env->GetObjectField(channelObject, getJaffiliateCallSignField));
-            if (jaffiliateCallSign != NULL)
+            JniUtfString affiliateCallSign(env, jaffiliateCallSign);
+            if (jaffiliateCallSign != nullptr)
             {
-                JniUtfString affiliateCallSign(env, jaffiliateCallSign);
                 channelInfo.affiliateCallSign = Optional<CharSpan>(affiliateCallSign.charSpan());
             }
 
@@ -144,25 +145,25 @@ CHIP_ERROR ChannelManager::HandleGetLineup(AttributeValueEncoder & aEncoder)
 
         jfieldID operatorNameFild = env->GetFieldID(channelLineupClazz, "operatorName", "Ljava/lang/String;");
         jstring joperatorName     = static_cast<jstring>(env->GetObjectField(channelLineupObject, operatorNameFild));
-        if (joperatorName != NULL)
+        JniUtfString operatorName(env, joperatorName);
+        if (joperatorName != nullptr)
         {
-            JniUtfString operatorName(env, joperatorName);
             lineupInfo.operatorName = operatorName.charSpan();
         }
 
         jfieldID lineupNameFild = env->GetFieldID(channelLineupClazz, "lineupName", "Ljava/lang/String;");
         jstring jlineupName     = static_cast<jstring>(env->GetObjectField(channelLineupObject, lineupNameFild));
-        if (jlineupName != NULL)
+        JniUtfString lineupName(env, jlineupName);
+        if (jlineupName != nullptr)
         {
-            JniUtfString lineupName(env, jlineupName);
             lineupInfo.lineupName = Optional<CharSpan>(lineupName.charSpan());
         }
 
         jfieldID postalCodeFild = env->GetFieldID(channelLineupClazz, "postalCode", "Ljava/lang/String;");
         jstring jpostalCode     = static_cast<jstring>(env->GetObjectField(channelLineupObject, postalCodeFild));
-        if (jpostalCode != NULL)
+        JniUtfString postalCode(env, jpostalCode);
+        if (jpostalCode != nullptr)
         {
-            JniUtfString postalCode(env, jpostalCode);
             lineupInfo.postalCode = Optional<CharSpan>(postalCode.charSpan());
         }
 
@@ -198,25 +199,25 @@ CHIP_ERROR ChannelManager::HandleGetCurrentChannel(AttributeValueEncoder & aEnco
 
         jfieldID getCallSignField = env->GetFieldID(channelClass, "callSign", "Ljava/lang/String;");
         jstring jcallSign         = static_cast<jstring>(env->GetObjectField(channelInfoObject, getCallSignField));
-        if (jcallSign != NULL)
+        JniUtfString callsign(env, jcallSign);
+        if (jcallSign != nullptr)
         {
-            JniUtfString callsign(env, jcallSign);
             channelInfo.callSign = Optional<CharSpan>(callsign.charSpan());
         }
 
         jfieldID getNameField = env->GetFieldID(channelClass, "name", "Ljava/lang/String;");
         jstring jname         = static_cast<jstring>(env->GetObjectField(channelInfoObject, getNameField));
-        if (jname != NULL)
+        JniUtfString name(env, jname);
+        if (jname != nullptr)
         {
-            JniUtfString name(env, jname);
             channelInfo.name = Optional<CharSpan>(name.charSpan());
         }
 
         jfieldID getJaffiliateCallSignField = env->GetFieldID(channelClass, "affiliateCallSign", "Ljava/lang/String;");
         jstring jaffiliateCallSign = static_cast<jstring>(env->GetObjectField(channelInfoObject, getJaffiliateCallSignField));
-        if (jaffiliateCallSign != NULL)
+        JniUtfString affiliateCallSign(env, jaffiliateCallSign);
+        if (jaffiliateCallSign != nullptr)
         {
-            JniUtfString affiliateCallSign(env, jaffiliateCallSign);
             channelInfo.affiliateCallSign = Optional<CharSpan>(affiliateCallSign.charSpan());
         }
 
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ChannelInfo.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ChannelInfo.java
@@ -23,12 +23,12 @@ public class ChannelInfo {
   public static final int kMultipleMatches = 0;
   public static final int kNoMatches = 1;
 
-  private int errorType;
-  private int majorNumber;
-  private int minorNumber;
-  private String name;
-  private String callSign;
-  private String affiliateCallSign;
+  public int errorType;
+  public int majorNumber;
+  public int minorNumber;
+  public String name;
+  public String callSign;
+  public String affiliateCallSign;
 
   public ChannelInfo(
       int majorNumber, int minorNumber, String name, String callSign, String affiliateCallSign) {
diff --git a/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ChannelManagerStub.java b/examples/tv-app/android/java/src/com/tcl/chip/tvapp/ChannelManagerStub.java
@@ -31,7 +31,7 @@ public ChannelManagerStub(int endpoint) {
   @Override
   public ChannelInfo[] getChannelList() {
     ChannelInfo ChannelInfo1 = new ChannelInfo(1, 11, "HDMI1", "callSign1", "affiliateCallSign1");
-    ChannelInfo ChannelInfo2 = new ChannelInfo(2, 22, "HDMI2", "callSign2", "affiliateCallSign2");
+    ChannelInfo ChannelInfo2 = new ChannelInfo(2, 22, "HDMI2", null, "");
     Log.d(TAG, "getChannelList at " + endpoint);
     return new ChannelInfo[] {ChannelInfo1, ChannelInfo2};
   }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include "ChannelManager.h"`
`19`	`19`	`#include "TvApp-JNI.h"`
`20`	`20`	`#include <app-common/zap-generated/ids/Clusters.h>`
	`21`	`+#include <cstdlib>`
`21`	`22`	`#include <jni.h>`
`22`	`23`	`#include <lib/core/CHIPSafeCasts.h>`
`23`	`24`	`#include <lib/support/CHIPJNIError.h>`
`@@ -82,25 +83,25 @@ CHIP_ERROR ChannelManager::HandleGetChannelList(AttributeValueEncoder & aEncoder`
`82`	`83`
`83`	`84`	`jfieldID getCallSignField = env->GetFieldID(channelClass, "callSign", "Ljava/lang/String;");`
`84`	`85`	`jstring jcallSign = static_cast<jstring>(env->GetObjectField(channelObject, getCallSignField));`
`85`		`- if (jcallSign != NULL)`
	`86`	`+ JniUtfString callsign(env, jcallSign);`
	`87`	`+ if (jcallSign != nullptr)`
`86`	`88`	`{`
`87`		`- JniUtfString callsign(env, jcallSign);`
`88`	`89`	`channelInfo.callSign = Optional<CharSpan>(callsign.charSpan());`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`jfieldID getNameField = env->GetFieldID(channelClass, "name", "Ljava/lang/String;");`
`92`	`93`	`jstring jname = static_cast<jstring>(env->GetObjectField(channelObject, getNameField));`
`93`		`- if (jname != NULL)`
	`94`	`+ JniUtfString name(env, jname);`
	`95`	`+ if (jname != nullptr)`
`94`	`96`	`{`
`95`		`- JniUtfString name(env, jname);`
`96`	`97`	`channelInfo.name = Optional<CharSpan>(name.charSpan());`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`jfieldID getJaffiliateCallSignField = env->GetFieldID(channelClass, "affiliateCallSign", "Ljava/lang/String;");`
`100`	`101`	`jstring jaffiliateCallSign = static_cast<jstring>(env->GetObjectField(channelObject, getJaffiliateCallSignField));`
`101`		`- if (jaffiliateCallSign != NULL)`
	`102`	`+ JniUtfString affiliateCallSign(env, jaffiliateCallSign);`
	`103`	`+ if (jaffiliateCallSign != nullptr)`
`102`	`104`	`{`
`103`		`- JniUtfString affiliateCallSign(env, jaffiliateCallSign);`
`104`	`105`	`channelInfo.affiliateCallSign = Optional<CharSpan>(affiliateCallSign.charSpan());`
`105`	`106`	`}`
`106`	`107`
`@@ -144,25 +145,25 @@ CHIP_ERROR ChannelManager::HandleGetLineup(AttributeValueEncoder & aEncoder)`
`144`	`145`
`145`	`146`	`jfieldID operatorNameFild = env->GetFieldID(channelLineupClazz, "operatorName", "Ljava/lang/String;");`
`146`	`147`	`jstring joperatorName = static_cast<jstring>(env->GetObjectField(channelLineupObject, operatorNameFild));`
`147`		`- if (joperatorName != NULL)`
	`148`	`+ JniUtfString operatorName(env, joperatorName);`
	`149`	`+ if (joperatorName != nullptr)`
`148`	`150`	`{`
`149`		`- JniUtfString operatorName(env, joperatorName);`
`150`	`151`	`lineupInfo.operatorName = operatorName.charSpan();`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`jfieldID lineupNameFild = env->GetFieldID(channelLineupClazz, "lineupName", "Ljava/lang/String;");`
`154`	`155`	`jstring jlineupName = static_cast<jstring>(env->GetObjectField(channelLineupObject, lineupNameFild));`
`155`		`- if (jlineupName != NULL)`
	`156`	`+ JniUtfString lineupName(env, jlineupName);`
	`157`	`+ if (jlineupName != nullptr)`
`156`	`158`	`{`
`157`		`- JniUtfString lineupName(env, jlineupName);`
`158`	`159`	`lineupInfo.lineupName = Optional<CharSpan>(lineupName.charSpan());`
`159`	`160`	`}`
`160`	`161`
`161`	`162`	`jfieldID postalCodeFild = env->GetFieldID(channelLineupClazz, "postalCode", "Ljava/lang/String;");`
`162`	`163`	`jstring jpostalCode = static_cast<jstring>(env->GetObjectField(channelLineupObject, postalCodeFild));`
`163`		`- if (jpostalCode != NULL)`
	`164`	`+ JniUtfString postalCode(env, jpostalCode);`
	`165`	`+ if (jpostalCode != nullptr)`
`164`	`166`	`{`
`165`		`- JniUtfString postalCode(env, jpostalCode);`
`166`	`167`	`lineupInfo.postalCode = Optional<CharSpan>(postalCode.charSpan());`
`167`	`168`	`}`
`168`	`169`
`@@ -198,25 +199,25 @@ CHIP_ERROR ChannelManager::HandleGetCurrentChannel(AttributeValueEncoder & aEnco`
`198`	`199`
`199`	`200`	`jfieldID getCallSignField = env->GetFieldID(channelClass, "callSign", "Ljava/lang/String;");`
`200`	`201`	`jstring jcallSign = static_cast<jstring>(env->GetObjectField(channelInfoObject, getCallSignField));`
`201`		`- if (jcallSign != NULL)`
	`202`	`+ JniUtfString callsign(env, jcallSign);`
	`203`	`+ if (jcallSign != nullptr)`
`202`	`204`	`{`
`203`		`- JniUtfString callsign(env, jcallSign);`
`204`	`205`	`channelInfo.callSign = Optional<CharSpan>(callsign.charSpan());`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`jfieldID getNameField = env->GetFieldID(channelClass, "name", "Ljava/lang/String;");`
`208`	`209`	`jstring jname = static_cast<jstring>(env->GetObjectField(channelInfoObject, getNameField));`
`209`		`- if (jname != NULL)`
	`210`	`+ JniUtfString name(env, jname);`
	`211`	`+ if (jname != nullptr)`
`210`	`212`	`{`
`211`		`- JniUtfString name(env, jname);`
`212`	`213`	`channelInfo.name = Optional<CharSpan>(name.charSpan());`
`213`	`214`	`}`
`214`	`215`
`215`	`216`	`jfieldID getJaffiliateCallSignField = env->GetFieldID(channelClass, "affiliateCallSign", "Ljava/lang/String;");`
`216`	`217`	`jstring jaffiliateCallSign = static_cast<jstring>(env->GetObjectField(channelInfoObject, getJaffiliateCallSignField));`
`217`		`- if (jaffiliateCallSign != NULL)`
	`218`	`+ JniUtfString affiliateCallSign(env, jaffiliateCallSign);`
	`219`	`+ if (jaffiliateCallSign != nullptr)`
`218`	`220`	`{`
`219`		`- JniUtfString affiliateCallSign(env, jaffiliateCallSign);`
`220`	`221`	`channelInfo.affiliateCallSign = Optional<CharSpan>(affiliateCallSign.charSpan());`
`221`	`222`	`}`
`222`	`223`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public ChannelManagerStub(int endpoint) {`
`31`	`31`	`@Override`
`32`	`32`	`public ChannelInfo[] getChannelList() {`
`33`	`33`	`ChannelInfo ChannelInfo1 = new ChannelInfo(1, 11, "HDMI1", "callSign1", "affiliateCallSign1");`
`34`		`- ChannelInfo ChannelInfo2 = new ChannelInfo(2, 22, "HDMI2", "callSign2", "affiliateCallSign2");`
	`34`	`+ ChannelInfo ChannelInfo2 = new ChannelInfo(2, 22, "HDMI2", null, "");`
`35`	`35`	`Log.d(TAG, "getChannelList at " + endpoint);`
`36`	`36`	`return new ChannelInfo[] {ChannelInfo1, ChannelInfo2};`
`37`	`37`	`}`