chore: Merge 4.57.1 into master (#6132)

RocketChat · Feb 14, 2025 · df051b9 · df051b9
2 parents 1ca8b8c + 2ec7001
commit df051b9
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 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.1"
+        versionName "4.57.1"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

diff --git a/app/lib/methods/helpers/sslPinning.ts b/app/lib/methods/helpers/sslPinning.ts
@@ -12,7 +12,7 @@ const { documentDirectory } = FileSystem;
 
 const extractFileScheme = (path: string) => path.replace('file://', ''); // file:// isn't allowed by obj-C
 
-const getPath = (name: string) => `${documentDirectory}/${name}`;
+const getPath = (name: string) => `${documentDirectory}${name}`;
 
 const persistCertificate = (name: string, password: string) => {
 	const certificatePath = getPath(name);

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.1;
+				MARKETING_VERSION = 4.57.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.1;
+				MARKETING_VERSION = 4.57.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.1</string>
+	<string>4.57.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/ios/SSLPinning.mm b/ios/SSLPinning.mm
@@ -12,6 +12,7 @@
 #import <SDWebImage/SDWebImageDownloader.h>
 #import "SecureStorage.h"
 #import "SRWebSocket.h"
+#import "EXSessionTaskDispatcher.h"
 
 @implementation Challenge : NSObject
 +(NSURLCredential *)getUrlCredential:(NSURLAuthenticationChallenge *)challenge path:(NSString *)path password:(NSString *)password
@@ -121,6 +122,18 @@ - (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthentica
 
 @end
 
+@implementation EXSessionTaskDispatcher (Challenge)
+
+- (void)URLSession:(NSURLSession *)session
+                task:(NSURLSessionTask *)task
+    didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
+    completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
+{
+  [Challenge runChallenge:session didReceiveChallenge:challenge completionHandler:completionHandler];
+}
+
+@end
+
 @implementation SRWebSocket (Challenge)
 
 - (void)setClientSSL:(NSString *)path password:(NSString *)password options:(NSMutableDictionary *)options;

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.1</string>
+	<string>4.57.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.1",
+	"version": "4.57.1",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",