Delete persisted subscriptions that are in subscription resumption st…

…ate when a subscribeRequest command comes in with keepSubscription flag set to false from the same subscriber

The Matter specification is saying:
"If KeepSubscriptions is FALSE, all existing or pending subscriptions on the publisher for this
subscriber SHALL be terminated."

Currently only active readHandlers and corresponding persisted subscription were removed. The subscriptions
that were persisted and in subscription resumption mode, were kept in persistent storage, keeping the
subscription resumption mechanism active, so pending subscriptions were not terminated. This fixes, when a subscribeRequest
come in with keepSubscriptions flag set to false, these persisted non-active subscriptions can be deleted
as well and the subscription resumption mechanism can be stopped if no other subscription were resuming.

src/app/InteractionModelEngine.cpp

@@ -723,14 +723,44 @@ Protocols::InteractionModel::Status InteractionModelEngine::OnReadInitialRequest
                 if (handler->IsFromSubscriber(*apExchangeContext))
                 {
                     ChipLogProgress(InteractionModel,
-                                    "Deleting previous subscription from NodeId: " ChipLogFormatX64 ", FabricIndex: %u",
+                                    "Deleting previous active subscription from NodeId: " ChipLogFormatX64 ", FabricIndex: %u",
                                     ChipLogValueX64(apExchangeContext->GetSessionHandle()->AsSecureSession()->GetPeerNodeId()),
                                     apExchangeContext->GetSessionHandle()->GetFabricIndex());
                     handler->Close();
                 }
 
                 return Loop::Continue;
             });
+
+#if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
+            // Also remove persisted subscriptions by checking if matching nodeId and fabricIndex
+            // iterate over persisted subscriptions and remove the ones that match the nodeId and fabricIndex
+            SubscriptionResumptionStorage::SubscriptionInfo subscriptionInfo;
+            auto * iterator = mpSubscriptionResumptionStorage->IterateSubscriptions();
+
+            while (iterator->Next(subscriptionInfo))
+            {
+                if (subscriptionInfo.mNodeId == apExchangeContext->GetSessionHandle()->AsSecureSession()->GetPeerNodeId() &&
+                    subscriptionInfo.mFabricIndex == apExchangeContext->GetSessionHandle()->GetFabricIndex())
+                {
+                    ChipLogProgress(InteractionModel,
+                                    "Deleting previous non-active subscription from NodeId: " ChipLogFormatX64 ", FabricIndex: %u",
+                                    ChipLogValueX64(subscriptionInfo.mNodeId), subscriptionInfo.mFabricIndex);
+                    mpSubscriptionResumptionStorage->Delete(subscriptionInfo.mNodeId, subscriptionInfo.mFabricIndex,
+                                                            subscriptionInfo.mSubscriptionId);
+                }
+            }
+            iterator->Release();
+
+            // If we have no subscriptions to resume, we can cancel the Timer, to make sure it is cleared in the case,
+            // we deleted a subscription in resumption mode.
+            if (!HasSubscriptionsToResume())
+            {
+                mpExchangeMgr->GetSessionManager()->SystemLayer()->CancelTimer(ResumeSubscriptionsTimerCallback, this);
+                mSubscriptionResumptionScheduled  = false;
+                mNumSubscriptionResumptionRetries = 0;
+            }
+#endif // CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION && CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
         }
 
         {