Merge pull request #463 from robszewczyk/bug/software-update-timer

Make the software update timer oblivious to service connectivity events

Author: robszewczyk

src/adaptations/device-layer/include/Weave/DeviceLayer/SoftwareUpdateManager.h

@@ -320,7 +320,6 @@ class SoftwareUpdateManager
     template<class> friend class Internal::GenericPlatformManagerImpl;
 
     WEAVE_ERROR Init(void);
-    void OnPlatformEvent(const WeaveDeviceEvent * event);
 
 protected:
 
@@ -482,11 +481,6 @@ inline WEAVE_ERROR SoftwareUpdateManager::PrepareImageStorageComplete(WEAVE_ERRO
     return static_cast<ImplClass*>(this)->_PrepareImageStorageComplete(aError);
 }
 
-inline void SoftwareUpdateManager::OnPlatformEvent(const WeaveDeviceEvent * event)
-{
-    static_cast<ImplClass*>(this)->_OnPlatformEvent(event);
-}
-
 inline SoftwareUpdateManager::State SoftwareUpdateManager::GetState(void)
 {
     return static_cast<ImplClass*>(this)->_GetState();

src/adaptations/device-layer/include/Weave/DeviceLayer/internal/GenericPlatformManagerImpl.ipp

@@ -421,9 +421,6 @@ void GenericPlatformManagerImpl<ImplClass>::DispatchEventToDeviceLayer(const Wea
     NetworkProvisioningSvr().OnPlatformEvent(event);
     FabricProvisioningSvr().OnPlatformEvent(event);
     ServiceProvisioningSvr().OnPlatformEvent(event);
-#if WEAVE_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-    SoftwareUpdateMgr().OnPlatformEvent(event);
-#endif
 #if WEAVE_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER
     TraitMgr().OnPlatformEvent(event);
 #endif // WEAVE_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER

src/adaptations/device-layer/include/Weave/DeviceLayer/internal/GenericSoftwareUpdateManagerImpl.h

@@ -53,7 +53,6 @@ class GenericSoftwareUpdateManagerImpl
     bool _IsInProgress(void);
     SoftwareUpdateManager::State _GetState(void);
 
-    void _OnPlatformEvent(const WeaveDeviceEvent * event);
     void _SetRetryPolicyCallback(const SoftwareUpdateManager::RetryPolicyCallback aRetryPolicyCallback);
 
     static void _DefaultEventHandler(void *apAppState, SoftwareUpdateManager::EventType aEvent,
@@ -131,7 +130,6 @@ class GenericSoftwareUpdateManagerImpl
 
     PacketBuffer * mImageQueryPacketBuffer;
 
-    bool mHaveServiceConnectivity;
     bool mScheduledCheckEnabled;
     bool mShouldRetry;
     bool mIgnorePartialImage;
@@ -161,4 +159,3 @@ extern template class Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateM
 
 // #endif // WEAVE_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
 #endif // GENERIC_SOFTWARE_UPDATE_MANAGER_IMPL_H
-

src/adaptations/device-layer/include/Weave/DeviceLayer/internal/GenericSoftwareUpdateManagerImpl.ipp

@@ -62,7 +62,6 @@ void GenericSoftwareUpdateManagerImpl<ImplClass>::DoInit()
 {
     mShouldRetry = false;
     mScheduledCheckEnabled = false;
-    mHaveServiceConnectivity = false;
     mIgnorePartialImage = false;
 
     mEventHandlerCallback = NULL;
@@ -122,6 +121,12 @@ void GenericSoftwareUpdateManagerImpl<ImplClass>::PrepareBinding(intptr_t arg)
 
     self->Cleanup();
 
+    if (!ConnectivityMgr().HaveServiceConnectivity())
+    {
+        WeaveLogProgress(DeviceLayer, "Software Update Check: No service connectivity");
+        ExitNow(err = WEAVE_ERROR_NOT_CONNECTED);
+    }
+
     self->mBinding = ExchangeMgr.NewBinding(HandleServiceBindingEvent, NULL);
     VerifyOrExit(self->mBinding != NULL, err = WEAVE_ERROR_NO_MEMORY);
 
@@ -436,27 +441,6 @@ bool GenericSoftwareUpdateManagerImpl<ImplClass>::_IsInProgress(void)
             false : true );
 }
 
-template<class ImplClass>
-void GenericSoftwareUpdateManagerImpl<ImplClass>::_OnPlatformEvent(const WeaveDeviceEvent * event)
-{
-    GenericSoftwareUpdateManagerImpl<ImplClass> * self = &SoftwareUpdateMgrImpl();
-
-     if (event->Type == DeviceEventType::kServiceConnectivityChange)
-     {
-        if (event->ServiceConnectivityChange.Overall.Result == kConnectivity_Established)
-        {
-            self->mHaveServiceConnectivity = true;
-        }
-        else if (event->ServiceConnectivityChange.Overall.Result == kConnectivity_Lost)
-        {
-            self->mHaveServiceConnectivity = false;
-            SystemLayer.CancelTimer(HandleHoldOffTimerExpired, NULL);
-        }
-
-        self->DriveState(SoftwareUpdateManager::kState_Idle);
-     }
-}
-
 template<class ImplClass>
 void GenericSoftwareUpdateManagerImpl<ImplClass>::SendQuery(void)
 {
@@ -729,7 +713,7 @@ void GenericSoftwareUpdateManagerImpl<ImplClass>::DriveState(SoftwareUpdateManag
              * will trigger on expiration of the timer unless service connectivity was lost or
              * the application requested a manual software update check.
              */
-            if ((mScheduledCheckEnabled || mShouldRetry) && mHaveServiceConnectivity)
+            if (mScheduledCheckEnabled || mShouldRetry)
             {
                 uint32_t timeToNextQueryMS = GetNextWaitTimeInterval();
 
@@ -740,10 +724,6 @@ void GenericSoftwareUpdateManagerImpl<ImplClass>::DriveState(SoftwareUpdateManag
                     SystemLayer.StartTimer(timeToNextQueryMS, HandleHoldOffTimerExpired, NULL);
                 }
             }
-            else if (!mHaveServiceConnectivity)
-            {
-                WeaveLogProgress(DeviceLayer, "Software Update Check Suspended - no service connectivity");
-            }
         }
         break;