diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp index 8d571bdb4f85fb..5950ec32198819 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp @@ -54,11 +54,11 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a if (value[attrId].isArray()) { return aEncoder.EncodeList([&](const auto & encoder) -> CHIP_ERROR { - int i = 0; - std::string targetId = to_string( - static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kIdentifier)); + int i = 0; + std::string targetId = to_string(static_cast( + chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Fields::kIdentifier)); std::string targetName = to_string( - static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kName)); + static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::Fields::kName)); for (Json::Value & entry : value[attrId]) { if (!entry[targetId].isUInt() || !entry[targetName].isString() || entry[targetId].asUInt() > 255) diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp index 2d78fe461a6c2e..c15521b9db383c 100644 --- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp +++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp @@ -321,7 +321,7 @@ jobject TargetListSuccessHandlerJNI::ConvertToJObject( auto iter = responseData.begin(); while (iter.Next()) { - const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & targetInfo = iter.GetValue(); + const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & targetInfo = iter.GetValue(); jclass responseTypeClass = nullptr; CHIP_ERROR err = diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm index 3e368d4ba949d8..51af07afb380c4 100644 --- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm +++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm @@ -1637,12 +1637,12 @@ - (void)targetNavigator_subscribeTargetList:(ContentApp * _Nonnull)contentApp objCTargetList = [NSMutableArray arrayWithCapacity:targetInfoCount]; auto iter = targetList.begin(); while (iter.Next()) { - const chip::app::Clusters::TargetNavigator::Structs::TargetInfo::DecodableType & targetInfo + const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & targetInfo = iter.GetValue(); - TargetNavigator_TargetInfo * objCTargetInfo = [[TargetNavigator_TargetInfo alloc] + TargetNavigator_TargetInfoStruct * objCTargetInfo = [[TargetNavigator_TargetInfoStruct alloc] initWithIdentifier:@(targetInfo.identifier) name:[NSString stringWithUTF8String:targetInfo.name.data()]]; - [objCTargetList addObject:objCTargetInfo]; + [objCTargetList addObject:objCTargetInfoStruct]; } } callback(objCTargetList);