Adding updates per comments

Author: lazarkov

examples/tv-app/android/include/messages/MessagesManager.h

@@ -25,11 +25,12 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate
 public:
     // Commands
     void HandlePresentMessagesRequest(
-        const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
-        const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
+        const chip::ByteSpan & messageId, 
+        const chip::app::Clusters::Messages::MessagePriorityEnum & priority,
+        const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> & messageControl, 
+        const chip::app::DataModel::Nullable<uint32_t> & startTime,
         const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
-        const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses) override;
-
+        const chip::Optional<chip::app::DataModel::DecodableList<chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::DecodableType>> & responses) override;
     void HandleCancelMessagesRequest(const chip::app::DataModel::DecodableList<chip::ByteSpan> & messageIds) override;
 
     // Attributes
@@ -41,4 +42,4 @@ class MessagesManager : public chip::app::Clusters::Messages::Delegate
 
 protected:
     std::list<std::string> mMessages;
-};
+};

examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp

@@ -17,9 +17,12 @@
 
 #include "MessagesManager.h"
 
+#include <app-common/zap-generated/attributes/Accessors.h>
+
 using namespace std;
 using namespace chip::app;
 using namespace chip::app::Clusters::Messages;
+using Message = chip::app::Clusters::Messages::Structs::MessageStruct::Type;
 
 // Commands
 void MessagesManager::HandlePresentMessagesRequest(
@@ -72,5 +75,7 @@ CHIP_ERROR MessagesManager::HandleGetActiveMessageIds(chip::app::AttributeValueE
 // Global Attributes
 uint32_t MessagesManager::GetFeatureMap(chip::EndpointId endpoint)
 {
-    return 1;
+    uint32_t featureMap = 0;
+    Attributes::FeatureMap::Get(endpoint, &featureMap);
+    return featureMap;
 }

examples/tv-app/tv-common/clusters/messages/MessagesManager.h

@@ -22,22 +22,17 @@
 #include <iostream>
 #include <list>
 
-using MessagesDelegate      = chip::app::Clusters::Messages::Delegate;
-using MessagePriorityEnum   = chip::app::Clusters::Messages::MessagePriorityEnum;
-using MessageControlBitmap  = chip::app::Clusters::Messages::MessageControlBitmap;
-using MessageResponseOption = chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type;
-using Message               = chip::app::Clusters::Messages::Structs::MessageStruct::Type;
-
-class MessagesManager : public MessagesDelegate
+class MessagesManager : public chip::app::Clusters::Messages::Delegate
 {
 public:
-    MessagesManager() : MessagesDelegate(){};
     // Commands
     void HandlePresentMessagesRequest(
-        const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
-        const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
+        const chip::ByteSpan & messageId, 
+        const chip::app::Clusters::Messages::MessagePriorityEnum & priority,
+        const chip::BitMask<chip::app::Clusters::Messages::MessageControlBitmap> & messageControl, 
+        const chip::app::DataModel::Nullable<uint32_t> & startTime,
         const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
-        const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses) override;
+        const chip::Optional<chip::app::DataModel::DecodableList<chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type>> & responses) override;
     void HandleCancelMessagesRequest(const chip::app::DataModel::DecodableList<chip::ByteSpan> & messageIds) override;
 
     // Attributes
@@ -48,5 +43,5 @@ class MessagesManager : public MessagesDelegate
     uint32_t GetFeatureMap(chip::EndpointId endpoint) override;
 
 protected:
-    std::list<Message> mMessages;
+    std::list<chip::app::Clusters::Messages::Structs::MessageStruct::Type> mMessages;
 };

src/app/clusters/messages-server/messages-delegate.h

@@ -31,9 +31,6 @@ namespace Messages {
 
 using MessageResponseOption = chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type;
 
-/** @brief
- *    Defines methods for implementing application-specific logic for the Content Launcher Cluster.
- */
 class Delegate
 {
 public:

src/app/clusters/messages-server/messages-server.cpp

@@ -15,13 +15,6 @@
  *    limitations under the License.
  */
 
-/****************************************************************************
- * @file
- * @brief Routines for the Media Playback plugin, the
- *server implementation of the Media Playback cluster.
- *******************************************************************************
- ******************************************************************************/
-
 #include <app/clusters/messages-server/messages-delegate.h>
 #include <app/clusters/messages-server/messages-server.h>
 
@@ -43,7 +36,7 @@ using chip::app::LogEvent;
 using chip::Protocols::InteractionModel::Status;
 
 static constexpr size_t kMessagesDelegateTableSize =
-    EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
+    MATTER_DM_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
 static_assert(kMessagesDelegateTableSize <= kEmberInvalidEndpointIndex, "Messages Delegate table size error");
 
 // -----------------------------------------------------------------------------
@@ -57,7 +50,7 @@ Delegate * GetDelegate(EndpointId endpoint)
 {
     ChipLogProgress(Zcl, "MessagesCluster NOT returning delegate for endpoint:%u", endpoint);
 
-    uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
+    uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, MATTER_DM_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
     return (ep >= kMessagesDelegateTableSize ? nullptr : gDelegateTable[ep]);
 }
 
@@ -79,15 +72,12 @@ namespace Messages {
 
 void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate)
 {
-    uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
+    uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, MATTER_DM_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
     // if endpoint is found
     if (ep < kMessagesDelegateTableSize)
     {
         gDelegateTable[ep] = delegate;
     }
-    else
-    {
-    }
 }
 
 bool Delegate::HasFeature(chip::EndpointId endpoint, Feature feature)
@@ -196,9 +186,8 @@ bool emberAfMessagesClusterPresentMessagesRequestCallback(
 
     Delegate * delegate = GetDelegate(endpoint);
     VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE);
-    {
-        delegate->HandlePresentMessagesRequest(messageId, priority, messageControl, startTime, duration, messageText, responses);
-    }
+    
+    delegate->HandlePresentMessagesRequest(messageId, priority, messageControl, startTime, duration, messageText, responses);
 
 exit:
     if (err != CHIP_NO_ERROR)
@@ -226,9 +215,8 @@ bool emberAfMessagesClusterCancelMessagesRequestCallback(
 
     Delegate * delegate = GetDelegate(endpoint);
     VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE);
-    {
-        delegate->HandleCancelMessagesRequest(messageIds);
-    }
+
+    delegate->HandleCancelMessagesRequest(messageIds);
 
 exit:
     if (err != CHIP_NO_ERROR)