Skip to content

Commit 1057338

Browse files
andy31415pull[bot]
authored andcommitted
Update some more TargetInfo structures after #24498 (#24558)
* Update some more TargetInfo structures after #24498 * Fix class reference: manual java class name was not updated
1 parent 3574411 commit 1057338

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a
5454
if (value[attrId].isArray())
5555
{
5656
return aEncoder.EncodeList([&](const auto & encoder) -> CHIP_ERROR {
57-
int i = 0;
58-
std::string targetId = to_string(
59-
static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kIdentifier));
57+
int i = 0;
58+
std::string targetId = to_string(static_cast<uint32_t>(
59+
chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Fields::kIdentifier));
6060
std::string targetName = to_string(
61-
static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kName));
61+
static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Fields::kName));
6262
for (Json::Value & entry : value[attrId])
6363
{
6464
if (!entry[targetId].isUInt() || !entry[targetName].isString() || entry[targetId].asUInt() > 255)

examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ jobject TargetListSuccessHandlerJNI::ConvertToJObject(
321321
auto iter = responseData.begin();
322322
while (iter.Next())
323323
{
324-
const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & targetInfo = iter.GetValue();
324+
const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & targetInfo = iter.GetValue();
325325

326326
jclass responseTypeClass = nullptr;
327327
CHIP_ERROR err =

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm

+3-3
Original file line numberDiff line numberDiff line change
@@ -1637,12 +1637,12 @@ - (void)targetNavigator_subscribeTargetList:(ContentApp * _Nonnull)contentApp
16371637
objCTargetList = [NSMutableArray arrayWithCapacity:targetInfoCount];
16381638
auto iter = targetList.begin();
16391639
while (iter.Next()) {
1640-
const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & targetInfo
1640+
const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & targetInfo
16411641
= iter.GetValue();
1642-
TargetNavigator_TargetInfo * objCTargetInfo = [[TargetNavigator_TargetInfo alloc]
1642+
TargetNavigator_TargetInfoStruct * objCTargetInfo = [[TargetNavigator_TargetInfoStruct alloc]
16431643
initWithIdentifier:@(targetInfo.identifier)
16441644
name:[NSString stringWithUTF8String:targetInfo.name.data()]];
1645-
[objCTargetList addObject:objCTargetInfo];
1645+
[objCTargetList addObject:objCTargetInfoStruct];
16461646
}
16471647
}
16481648
callback(objCTargetList);

0 commit comments

Comments
 (0)