XIONE-17284 : VG not working after FSR (rdkcentral#6284) (rdkcentral#6290) (rdkcentral#6297)

Reason for change: update retry mechanism
Test Procedure: Mentioned in ticket
Risks: Low

Signed-off-by: vdinak240 <[email protected]>

Author: vdinak240

TextToSpeech/CHANGELOG.md

@@ -15,10 +15,13 @@ All notable changes to this RDK Service will be documented in this file.
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
+## [1.0.36] - 2025-06-19
+### Fixed
+- Fixed coverity reported issue
 
-## [1.0.35] - 2025-06-19
+## [1.0.35] - 2025-06-16
 ### Fixed
-- Fixed coverity reported issues
+- EAA -VG not working on FTUE screen
 
 ## [1.0.34] - 2025-04-01
 ### Fixed

TextToSpeech/TextToSpeech.cpp

@@ -21,7 +21,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 35
+#define API_VERSION_NUMBER_PATCH 36
 #define API_VERSION_NUMBER 1
 
 namespace WPEFramework {

TextToSpeech/impl/RFCURLObserver.cpp

@@ -15,7 +15,6 @@
 #define SYSTEMSERVICE_CALLSIGN "org.rdk.System"
 #define SYSTEMSERVICE_CALLSIGN_VER SYSTEMSERVICE_CALLSIGN".1"
 
-#define MAX_RETRIES 3 // Define the maximum number of retries
 #define RETRY_DELAY_MS 2000 // Define the delay between retries in milliseconds
 
 using namespace WPEFramework;
@@ -109,8 +108,7 @@ void RFCURLObserver::registerNotification() {
             m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"", false, token);
         }
 
-	int retries = 0;
-        while (retries < MAX_RETRIES) {		
+        while (!m_eventRegistered) {		
             if (m_systemService->Subscribe<JsonObject>(3000, "onDeviceMgtUpdateReceived",
                 &RFCURLObserver::onDeviceMgtUpdateReceivedHandler, this) == Core::ERROR_NONE) {
                 m_eventRegistered = true;
@@ -119,13 +117,8 @@ void RFCURLObserver::registerNotification() {
             } else {
                 TTSLOG_ERROR("Failed to subscribe to notification handler: onDeviceMgtUpdateReceived..Retrying");
                 std::this_thread::sleep_for(std::chrono::milliseconds(RETRY_DELAY_MS));
-                retries++;
             }
         }
-
-       if (!m_eventRegistered) {
-            TTSLOG_ERROR("Failed to subscribe to notification handler after maximum retries.");
-       }
     }
 }
 

TextToSpeech/impl/SatToken.cpp

@@ -84,6 +84,16 @@ string SatToken::getSecurityToken() {
      return token;
 }
 
+std::string SatToken::getSAT() {
+    if (m_tokenUpdated.load(std::memory_order_acquire)) { 
+        TTSLOG_INFO("SAT token updated refetch");
+        getServiceAccessToken();
+        m_tokenUpdated.store(false, std::memory_order_release);
+    }
+    std::lock_guard<std::mutex> lock(m_mutex);
+    return m_SatToken;
+}
+
 void SatToken::getServiceAccessToken() {
     if(m_authService != nullptr) {
         JsonObject joGetParams, joGetResult;
@@ -108,8 +118,8 @@ void SatToken::getServiceAccessToken() {
 }
 
 void SatToken::serviceAccessTokenChangedEventHandler(const JsonObject& parameters) {
-    TTSLOG_INFO("SAT changed");
-    getServiceAccessToken();
+     TTSLOG_INFO("TTS - SAT token updated notification");
+     m_tokenUpdated.store(true, std::memory_order_release);
 }
 
 }

TextToSpeech/impl/SatToken.h

@@ -1,6 +1,7 @@
 #ifndef _TTS_SATTOKEN_H_
 #define _TTS_SATTOKEN_H_
 #include "TTSCommon.h"
+#include <atomic>
 #include <mutex>
 
 namespace WPEFramework {
@@ -10,10 +11,7 @@ namespace TTS {
 class SatToken {
 public:
     static SatToken* getInstance(const string callsign);
-    string getSAT() { 
-        std::lock_guard<std::mutex> lock(m_mutex);
-        return m_SatToken; 
-    };
+    string getSAT();
 
 private:
     SatToken(){};
@@ -30,6 +28,7 @@ class SatToken {
     string m_callsign;
     std::mutex m_mutex;
     bool m_eventRegistered{false};
+    std::atomic<bool> m_tokenUpdated {false};
 };
 }
 }