chore: Merge 4.56.1 into master (#6082)

RocketChat · Jan 7, 2025 · a21a84e · a21a84e
2 parents c53294f + 5f81d4d
commit a21a84e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -93,7 +93,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.56.0"
+        versionName "4.56.1"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -2983,7 +2983,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.56.0;
+				MARKETING_VERSION = 4.56.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3027,7 +3027,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.56.0;
+				MARKETING_VERSION = 4.56.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;

diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.56.0</string>
+	<string>4.56.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/ios/SSLPinning/SSLPinning.m b/ios/SSLPinning/SSLPinning.m
@@ -1,3 +1,9 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
+
 @interface RCT_EXTERN_MODULE(SSLPinning, NSObject)
+
+RCT_EXTERN_METHOD(setCertificate:(NSString *)server
+                  :(NSString *)path
+                  :(NSString *)password)
+
 @end
diff --git a/ios/SSLPinning/SSLPinning.swift b/ios/SSLPinning/SSLPinning.swift
@@ -28,7 +28,7 @@ final class SSLPinning: NSObject {
         }
 
         serversQuery.forEach { server in
-            guard let serverUrlString = server["url"] as? String,
+            guard let serverUrlString = server["id"] as? String,
                   let serverUrl = URL(string: serverUrlString),
                   let clientSSL = mmkv.clientSSL(for: serverUrl) else {
                 return

diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.56.0</string>
+	<string>4.56.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.56.0",
+	"version": "4.56.1",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",