Revert "Fix handling of non-permitted messages in ExchangeContext. (project-chip#33148) (project-chip#33290)"

This reverts commit 13ab158.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

src/messaging/ExchangeContext.cpp

@@ -594,26 +594,21 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
     // Set kFlagReceivedAtLeastOneMessage to true since we have received at least one new application level message
     SetHasReceivedAtLeastOneMessage(true);
 
-    // Don't send messages on to our delegate if our dispatch does not allow
-    // those messages.  Those messages should also not be treated as responses,
-    // since if our delegate is expecting a response we will not notify it about
-    // these messages.
-    if (mDispatch.MessagePermitted(payloadHeader.GetProtocolID(), payloadHeader.GetMessageType()))
+    if (IsResponseExpected())
     {
-        if (IsResponseExpected())
-        {
-            // Since we got the response, cancel the response timer.
-            CancelResponseTimer();
+        // Since we got the response, cancel the response timer.
+        CancelResponseTimer();
 
-            // If the context was expecting a response to a previously sent message, this message
-            // is implicitly that response.
-            SetResponseExpected(false);
-        }
+        // If the context was expecting a response to a previously sent message, this message
+        // is implicitly that response.
+        SetResponseExpected(false);
+    }
 
-        if (mDelegate != nullptr)
-        {
-            return mDelegate->OnMessageReceived(this, payloadHeader, std::move(msgBuf));
-        }
+    // Don't send messages on to our delegate if our dispatch does not allow
+    // those messages.
+    if (mDelegate != nullptr && mDispatch.MessagePermitted(payloadHeader.GetProtocolID(), payloadHeader.GetMessageType()))
+    {
+        return mDelegate->OnMessageReceived(this, payloadHeader, std::move(msgBuf));
     }
 
     DefaultOnMessageReceived(this, payloadHeader.GetProtocolID(), payloadHeader.GetMessageType(), messageCounter,