remove emberCurremtCommnad (#13818)

mkardous-silabs · pull[bot] · commit 4114150691a1 · 2024-01-26T14:57:08.000Z
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -296,9 +296,9 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a
     {
 #ifdef EMBER_AF_PLUGIN_SCENES
         GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID;
-        if (emberAfCurrentCommand()->type == EMBER_INCOMING_MULTICAST)
+        if (commandObj->GetExchangeContext()->IsGroupExchangeContext())
         {
-            groupId = emberAfCurrentCommand()->source->GetSessionHandle()->AsGroupSession()->GetGroupId();
+            groupId = commandObj->GetExchangeContext()->GetSessionHandle()->AsGroupSession()->GetGroupId();
         }
 
         emberAfScenesClusterStoreCurrentSceneCallback(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID);
@@ -351,9 +351,9 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb
 
 #ifdef EMBER_AF_PLUGIN_SCENES
     GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID;
-    if (emberAfCurrentCommand()->type == EMBER_INCOMING_MULTICAST)
+    if (commandObj->GetExchangeContext()->IsGroupExchangeContext())
     {
-        groupId = emberAfCurrentCommand()->source->GetSessionHandle()->AsGroupSession()->GetGroupId();
+        groupId = commandObj->GetExchangeContext()->GetSessionHandle()->AsGroupSession()->GetGroupId();
     }
 
     emberAfScenesClusterRecallSavedSceneCallback(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID);

Original file line number	Diff line number	Diff line change
`@@ -296,9 +296,9 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a`
`296`	`296`	`{`
`297`	`297`	`#ifdef EMBER_AF_PLUGIN_SCENES`
`298`	`298`	`GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID;`
`299`		`- if (emberAfCurrentCommand()->type == EMBER_INCOMING_MULTICAST)`
	`299`	`+ if (commandObj->GetExchangeContext()->IsGroupExchangeContext())`
`300`	`300`	`{`
`301`		`- groupId = emberAfCurrentCommand()->source->GetSessionHandle()->AsGroupSession()->GetGroupId();`
	`301`	`+ groupId = commandObj->GetExchangeContext()->GetSessionHandle()->AsGroupSession()->GetGroupId();`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`emberAfScenesClusterStoreCurrentSceneCallback(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID);`
`@@ -351,9 +351,9 @@ bool OnOffServer::OnWithRecallGlobalSceneCommand(app::CommandHandler * commandOb`
`351`	`351`
`352`	`352`	`#ifdef EMBER_AF_PLUGIN_SCENES`
`353`	`353`	`GroupId groupId = ZCL_SCENES_GLOBAL_SCENE_GROUP_ID;`
`354`		`- if (emberAfCurrentCommand()->type == EMBER_INCOMING_MULTICAST)`
	`354`	`+ if (commandObj->GetExchangeContext()->IsGroupExchangeContext())`
`355`	`355`	`{`
`356`		`- groupId = emberAfCurrentCommand()->source->GetSessionHandle()->AsGroupSession()->GetGroupId();`
	`356`	`+ groupId = commandObj->GetExchangeContext()->GetSessionHandle()->AsGroupSession()->GetGroupId();`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`emberAfScenesClusterRecallSavedSceneCallback(fabric, endpoint, groupId, ZCL_SCENES_GLOBAL_SCENE_SCENE_ID);`