Delia 67689 main (rdkcentral#6250)

* DELIA-67689 : Increase secmanager timeout (rdkcentral#6155)

Reason for change: depending on the server response time and
network time the call can take 1-3 seconds normally and
sometimes even a little more.
Test Procedure: None
Risks: None
Signed-off-by: Nikita Poltorapavlo <[email protected]>

* DELIA-67689 : Fix typo in json-rpc param (rdkcentral#6164)

Reason for change: As there's no c++ interface for SecManager/Watermark
plugins parameter names written by hand had typos.
Test Procedure: None
Risks: None
Signed-off-by: Nikita Poltorapavlo <[email protected]>

* update changelog and api version

---------

Signed-off-by: Nikita Poltorapavlo <[email protected]>
Co-authored-by: Anand Kandasamy <[email protected]>

Author: npoltorapavlo

ContentProtection/CHANGELOG.md

@@ -16,6 +16,11 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.1.1] - 2025-05-26
+### Fixed
+- Increase secmanager timeout
+- Fix typo in json-rpc param
+
 ## [1.1.0] - 2025-05-13
 ### Changed
 - New appId parameter in openDrmSession and onWatermarkStatusChanged, opacityLevel parameter in showWatermark

ContentProtection/ContentProtection.cpp

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

ContentProtection/ContentProtection.h

@@ -166,8 +166,8 @@ namespace Plugin {
             SetPlaybackSessionStateParams()
             {
                 Add(_T("clientId"), &ClientId);
-                Add(_T("sessionid"), &SessionId);
-                Add(_T("sessionstate"), &SessionState);
+                Add(_T("sessionId"), &SessionId);
+                Add(_T("sessionState"), &SessionState);
             }
             Core::JSON::String ClientId;
             Core::JSON::DecUInt32 SessionId;
@@ -180,7 +180,7 @@ namespace Plugin {
             ClosePlaybackSessionParams()
             {
                 Add(_T("clientId"), &ClientId);
-                Add(_T("sessionid"), &SessionId);
+                Add(_T("sessionId"), &SessionId);
             }
             Core::JSON::String ClientId;
             Core::JSON::DecUInt32 SessionId;
@@ -189,7 +189,7 @@ namespace Plugin {
         struct SetPlaybackSpeedStateParams : public Core::JSON::Container {
             SetPlaybackSpeedStateParams()
             {
-                Add(_T("sessionid"), &SessionId);
+                Add(_T("sessionId"), &SessionId);
                 Add(_T("playbackSpeed"), &PlaybackSpeed);
                 Add(_T("playbackPosition"), &PlaybackPosition);
             }
@@ -285,6 +285,7 @@ namespace Plugin {
 
     private:
         enum { Timeout = 1000 };
+        enum { OpenSessionTimeout = 5000 };
 
     private:
         using JSONRPCLink = WPEFramework::JSONRPC::SmartLinkType<
@@ -355,7 +356,7 @@ namespace Plugin {
                 out["licenseRequest"] = licenseRequest;
                 JsonObject in;
                 result = _parent._secManager->Invoke<JsonObject, JsonObject>(
-                    Timeout, _T("openPlaybackSession"), out, in);
+                    OpenSessionTimeout, _T("openPlaybackSession"), out, in);
                 if (result == Core::ERROR_NONE) {
                     if (!in["success"].Boolean()) {
                         result = Core::ERROR_GENERAL;
@@ -416,7 +417,7 @@ namespace Plugin {
                 JsonObject in;
                 result = _parent._secManager->Invoke<
                     JsonObject, JsonObject>(
-                    Timeout, _T("updatePlaybackSession"), out, in);
+                    OpenSessionTimeout, _T("updatePlaybackSession"), out, in);
                 if (result == Core::ERROR_NONE) {
                     if (!in["success"].Boolean()) {
                         result = Core::ERROR_GENERAL;