commit 474cd9016f039c00b49134d43af92d7e47911e21
author Jason Graffius <jgraff@google.com> Tue Jul 20 22:20:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 20 22:20:59 2021 +0000
tree 7bd6589bb23e1730c0cc4333589efe9f3a818f5c
parent 706ef08aee4546d01ef4502291624aba5fb1e68e
parent 14af3efd7709cf787fe9bf63a2350227dd251c04

Merge "[openweave-core] Conditional PII logging" into main

src/adaptations/device-layer/TraitManager.cpp

diff --git a/src/adaptations/device-layer/TraitManager.cpp b/src/adaptations/device-layer/TraitManager.cpp
index d82a8fe..ceeb940 100644
--- a/src/adaptations/device-layer/TraitManager.cpp
+++ b/src/adaptations/device-layer/TraitManager.cpp
@@ -350,6 +350,7 @@
         const SubscriptionClient::InEventParam & inParam, SubscriptionClient::OutEventParam & outParam)
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
+    TraitManager* self = reinterpret_cast<TraitManager*>(appState);
 
     switch (eventType)
     {
@@ -401,6 +402,11 @@
             event.ServiceSubscriptionStateChange.Result = kConnectivity_Lost;
             PlatformMgr().PostEvent(&event);
         }
+        // Disable resubscribe as subscription was already terminated.
+        if (!ConfigurationMgr().IsPairedToAccount()) {
+            self->mServiceSubClient->DisableResubscribe();
+            SetFlag(self->mFlags, kFlag_ServiceSubscriptionActivated, false);
+        }
         break;
 
     default: