Merge pull request #406 from SUPLA/develop

v24.08
SUPLA · Aug 6, 2024 · eb3289f · eb3289f
2 parents a27688c + 4c8d0ec
commit eb3289f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/LibSuplaClient.xcframework/ios-arm64_armv7_armv7s/Headers/supla-client.h b/LibSuplaClient.xcframework/ios-arm64_armv7_armv7s/Headers/supla-client.h
@@ -333,15 +333,15 @@ _supla_int_t srpc_evtool_v1_extended2thermostatextended(
 
 _supla_int_t supla_single_call_execute_action(
     TCS_ClientAuthorizationDetails *auth_details, int protocol_version,
-    TCS_Action *action);
+    int conn_timeout_ms, TCS_Action *action);
 
 _supla_int_t supla_single_call_register_pn_client_token(
     TCS_ClientAuthorizationDetails *auth_details, int protocol_version,
-    TCS_PnClientToken *token);
+    int conn_timeout_ms, TCS_PnClientToken *token);
 
 _supla_int_t supla_single_call_get_channel_value(
     TCS_ClientAuthorizationDetails *auth_details, int protocol_version,
-    int channel_id, TSC_GetChannelValueResult *vresult);
+    int conn_timeout_ms, int channel_id, TSC_GetChannelValueResult *vresult);
 
 #ifdef __cplusplus
 }

diff --git a/LibSuplaClient.xcframework/ios-arm64_x86_64-simulator/Headers/supla-client.h b/LibSuplaClient.xcframework/ios-arm64_x86_64-simulator/Headers/supla-client.h
@@ -333,15 +333,15 @@ _supla_int_t srpc_evtool_v1_extended2thermostatextended(
 
 _supla_int_t supla_single_call_execute_action(
     TCS_ClientAuthorizationDetails *auth_details, int protocol_version,
-    TCS_Action *action);
+    int conn_timeout_ms, TCS_Action *action);
 
 _supla_int_t supla_single_call_register_pn_client_token(
     TCS_ClientAuthorizationDetails *auth_details, int protocol_version,
-    TCS_PnClientToken *token);
+    int conn_timeout_ms, TCS_PnClientToken *token);
 
 _supla_int_t supla_single_call_get_channel_value(
     TCS_ClientAuthorizationDetails *auth_details, int protocol_version,
-    int channel_id, TSC_GetChannelValueResult *vresult);
+    int conn_timeout_ms, int channel_id, TSC_GetChannelValueResult *vresult);
 
 #ifdef __cplusplus
 }

diff --git a/SUPLA.xcodeproj/project.pbxproj b/SUPLA.xcodeproj/project.pbxproj
@@ -7567,7 +7567,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SUPLA/SUPLA.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 192;
+				CURRENT_PROJECT_VERSION = 193;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = T6ZPGSWA75;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -7586,7 +7586,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SUPLA/lib",
 				);
-				MARKETING_VERSION = 24.07;
+				MARKETING_VERSION = 24.08;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsoftware.ios.supla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -7606,7 +7606,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SUPLA/SUPLA.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 192;
+				CURRENT_PROJECT_VERSION = 193;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = T6ZPGSWA75;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -7625,7 +7625,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SUPLA/lib",
 				);
-				MARKETING_VERSION = 24.07;
+				MARKETING_VERSION = 24.08;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsoftware.ios.supla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SUPLA/SUPLA-Bridging-Header.h";

diff --git a/SUPLA/Core/Networking/SingleCall.swift b/SUPLA/Core/Networking/SingleCall.swift
@@ -24,7 +24,7 @@ class SingleCallImpl: SingleCall {
 
     func registerPushToken(_ authDetails: UnsafeMutablePointer<TCS_ClientAuthorizationDetails>, _ protocolVersion: Int32, _ tokenDetails: UnsafeMutablePointer<TCS_PnClientToken>) throws {
 
-        let result = supla_single_call_register_pn_client_token(authDetails, protocolVersion, tokenDetails)
+        let result = supla_single_call_register_pn_client_token(authDetails, protocolVersion, 5000, tokenDetails)
 
         if (result != SUPLA_RESULTCODE_TRUE) {
             throw SingleCallError.resultException(errorCode: result)