Restyled by clang-format

project-chip · Sep 29, 2022 · feaa217 · feaa217
1 parent 34118af
commit feaa217
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 47 deletions.
diff --git a/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.cpp b/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.cpp
@@ -24,7 +24,6 @@
 using namespace chip;
 using namespace chip::app::Clusters::KeypadInput;
 
-
 void AppKeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CecKeyCode & keyCode)
 {
     Commands::SendKeyResponse::Type response;

diff --git a/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.h b/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.h
@@ -27,7 +27,6 @@ using SendKeyResponseType = chip::app::Clusters::KeypadInput::Commands::SendKeyR
 class AppKeypadInputManager : public KeypadInputDelegate
 {
 public:
-
     void HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper,
                        const chip::app::Clusters::KeypadInput::CecKeyCode & keyCode) override;
 

diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp
@@ -18,13 +18,14 @@
 #include "TargetNavigatorManager.h"
 #include <json/json.h>
 
-
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters::TargetNavigator;
 using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
 
-TargetNavigatorManager::TargetNavigatorManager(ContentAppAttributeDelegate * attributeDelegate, std::list<std::string> targets, uint8_t currentTarget) : mAttributeDelegate(attributeDelegate)
+TargetNavigatorManager::TargetNavigatorManager(ContentAppAttributeDelegate * attributeDelegate, std::list<std::string> targets,
+                                               uint8_t currentTarget) :
+    mAttributeDelegate(attributeDelegate)
 {
     mTargets       = targets;
     mCurrentTarget = currentTarget;
@@ -34,9 +35,10 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a
 {
     ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget");
 
-    if (mAttributeDelegate != nullptr) {
+    if (mAttributeDelegate != nullptr)
+    {
         chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id,
-                                                chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
+                                                   chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
         const char * resStr = mAttributeDelegate->Read(aPath);
         ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response %s", resStr);
 
@@ -47,21 +49,22 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a
             if (reader.parse(resStr, value))
             {
                 std::string attrId = to_string(chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
-                ChipLogProgress(
-                    Zcl, "TargetNavigatorManager::HandleNavigateTarget response parsing done. reading attr %s",
-                    attrId.c_str());
+                ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response parsing done. reading attr %s",
+                                attrId.c_str());
                 if (value[attrId].isArray())
                 {
                     return aEncoder.EncodeList([&](const auto & encoder) -> CHIP_ERROR {
-                        int i = 0;
-                        std::string targetId = to_string(static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kIdentifier));
-                        std::string targetName = to_string(static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kName));
+                        int i                = 0;
+                        std::string targetId = to_string(
+                            static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kIdentifier));
+                        std::string targetName = to_string(
+                            static_cast<uint32_t>(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kName));
                         for (Json::Value & entry : value[attrId])
                         {
-                            if (!entry[targetId].isUInt() || !entry[targetName].isString() || entry[targetId].asUInt() > 255) {
+                            if (!entry[targetId].isUInt() || !entry[targetName].isString() || entry[targetId].asUInt() > 255)
+                            {
                                 // invalid target ID. Ignore.
-                                ChipLogError(
-                                    Zcl, "TargetNavigatorManager::HandleNavigateTarget invalid target ignored");
+                                ChipLogError(Zcl, "TargetNavigatorManager::HandleNavigateTarget invalid target ignored");
                                 i++;
                                 continue;
                             }
@@ -74,10 +77,8 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a
                         return CHIP_NO_ERROR;
                     });
                 }
-
             }
         }
-
     }
 
     // NOTE: the ids for each target start at 1 so that we can reserve 0 as "no current target"
@@ -99,9 +100,10 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget()
 {
     ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget");
 
-    if (mAttributeDelegate != nullptr) {
+    if (mAttributeDelegate != nullptr)
+    {
         chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id,
-                                                chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
+                                                   chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id);
         const char * resStr = mAttributeDelegate->Read(aPath);
         ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response %s", resStr);
 
@@ -112,17 +114,14 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget()
             if (reader.parse(resStr, value))
             {
                 std::string attrId = to_string(chip::app::Clusters::TargetNavigator::Attributes::CurrentTarget::Id);
-                ChipLogProgress(
-                    Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response parsing done. reading attr %s",
-                    attrId.c_str());
+                ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response parsing done. reading attr %s",
+                                attrId.c_str());
                 if (value[attrId].isUInt() && value[attrId].asUInt() < 256)
                 {
                     return static_cast<uint8_t>(value[attrId].asUInt());
                 }
-
             }
         }
-
     }
 
     return mCurrentTarget;

diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h
@@ -20,13 +20,13 @@
 #include "../../java/ContentAppAttributeDelegate.h"
 #include <app/clusters/target-navigator-server/target-navigator-server.h>
 
-using chip::app::AttributeValueEncoder;
-using chip::app::CommandResponseHelper;
 using chip::CharSpan;
 using chip::EndpointId;
-using TargetNavigatorDelegate    = chip::app::Clusters::TargetNavigator::Delegate;
-using TargetInfoType             = chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type;
-using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
+using chip::app::AttributeValueEncoder;
+using chip::app::CommandResponseHelper;
+using TargetNavigatorDelegate     = chip::app::Clusters::TargetNavigator::Delegate;
+using TargetInfoType              = chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type;
+using NavigateTargetResponseType  = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
 using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate;
 
 class TargetNavigatorManager : public TargetNavigatorDelegate
@@ -51,5 +51,4 @@ class TargetNavigatorManager : public TargetNavigatorDelegate
     EndpointId mEndpointId;
 
     ContentAppAttributeDelegate * mAttributeDelegate;
-
 };
diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
@@ -34,12 +34,12 @@
 namespace chip {
 namespace AppPlatform {
 
-using CommandHandlerInterface = chip::app::CommandHandlerInterface;
-using LaunchResponseType      = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
-using PlaybackResponseType      = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type;
-using NavigateTargetResponseType      = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
+using CommandHandlerInterface    = chip::app::CommandHandlerInterface;
+using LaunchResponseType         = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type;
+using PlaybackResponseType       = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type;
+using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type;
 
-const std::string FAILURE_KEY = "PlatformError";
+const std::string FAILURE_KEY        = "PlatformError";
 const std::string FAILURE_STATUS_KEY = "Status";
 
 void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerContext & handlerContext)
@@ -55,7 +55,8 @@ void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerCo
         if (err != CHIP_NO_ERROR)
         {
             handlerContext.SetCommandHandled();
-            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
+            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath,
+                                                     Protocols::InteractionModel::Status::InvalidCommand);
             return;
         }
 
@@ -99,11 +100,13 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
     }
 
     // handle errors from platform-app
-    if (!value[FAILURE_KEY].empty()) {
+    if (!value[FAILURE_KEY].empty())
+    {
         value = value[FAILURE_KEY];
         if (!value[FAILURE_STATUS_KEY].empty() && value[FAILURE_STATUS_KEY].isUInt())
         {
-            handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, static_cast<Protocols::InteractionModel::Status>(value[FAILURE_STATUS_KEY].asUInt()));
+            handlerContext.mCommandHandler.AddStatus(
+                handlerContext.mRequestPath, static_cast<Protocols::InteractionModel::Status>(value[FAILURE_STATUS_KEY].asUInt()));
             return;
         }
         handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
@@ -114,16 +117,19 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
     {
     case app::Clusters::ContentLauncher::Id: {
         LaunchResponseType launchResponse;
-        std::string statusFieldId = std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kStatus));
+        std::string statusFieldId =
+            std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kStatus));
         if (value[statusFieldId].empty())
         {
             handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
             return;
         }
         else
         {
-            launchResponse.status = static_cast<app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value[statusFieldId].asInt());
-            std::string dataFieldId = std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kData));
+            launchResponse.status =
+                static_cast<app::Clusters::ContentLauncher::ContentLaunchStatusEnum>(value[statusFieldId].asInt());
+            std::string dataFieldId =
+                std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kData));
             if (!value[dataFieldId].empty())
             {
                 launchResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
@@ -135,16 +141,19 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
 
     case app::Clusters::TargetNavigator::Id: {
         NavigateTargetResponseType navigateTargetResponse;
-        std::string statusFieldId = std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kStatus));
+        std::string statusFieldId =
+            std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kStatus));
         if (value[statusFieldId].empty())
         {
             handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
             return;
         }
         else
         {
-            navigateTargetResponse.status = static_cast<app::Clusters::TargetNavigator::TargetNavigatorStatusEnum>(value[statusFieldId].asInt());
-            std::string dataFieldId = std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData));
+            navigateTargetResponse.status =
+                static_cast<app::Clusters::TargetNavigator::TargetNavigatorStatusEnum>(value[statusFieldId].asInt());
+            std::string dataFieldId =
+                std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData));
             if (!value[dataFieldId].empty())
             {
                 navigateTargetResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
@@ -156,16 +165,19 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand
 
     case app::Clusters::MediaPlayback::Id: {
         PlaybackResponseType playbackResponse;
-        std::string statusFieldId = std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kStatus));
+        std::string statusFieldId =
+            std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kStatus));
         if (value[statusFieldId].empty())
         {
             handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure);
             return;
         }
         else
         {
-            playbackResponse.status = static_cast<app::Clusters::MediaPlayback::MediaPlaybackStatusEnum>(value[statusFieldId].asInt());
-            std::string dataFieldId = std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData));
+            playbackResponse.status =
+                static_cast<app::Clusters::MediaPlayback::MediaPlaybackStatusEnum>(value[statusFieldId].asInt());
+            std::string dataFieldId =
+                std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData));
             if (!value[dataFieldId].empty())
             {
                 playbackResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));
-Original file line number
+Diff line change
@@ Expand Up @@
     class AppKeypadInputManager : public KeypadInputDelegate
     {
     public:
         void HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper,
                            const chip::app::Clusters::KeypadInput::CecKeyCode & keyCode) override;
@@ Expand Down @@