From b5abfb7cf66bc12da2cf10ade85364f1ab1f923d Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 24 Jan 2025 18:20:18 -0300 Subject: [PATCH 1/3] chore: Bump version to 4.58.0 (#6109) --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1d8925248a..ba890b5f8b 100644 --- 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.57.0" + versionName "4.58.0" vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 84579dae51..465a6ae48d 100644 --- 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.57.0; + MARKETING_VERSION = 4.58.0; 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.57.0; + MARKETING_VERSION = 4.58.0; 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 index 14c9ce19cb..f9405c63de 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -28,7 +28,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.57.0 + 4.58.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index 5bd34ec3ad..688841f420 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.57.0 + 4.58.0 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index be758f2ae1..ae072c6ba4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.57.0", + "version": "4.58.0", "private": true, "scripts": { "start": "react-native start", From 1ad5e0656bd9cad51b35da9d2ac317aefa2c007e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Stasiak?= <91474186+OtavioStasiak@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:42:12 -0300 Subject: [PATCH 2/3] fix: unable to open some attachments with SSL Client Certificate enabled (#6130) --- app/lib/methods/helpers/sslPinning.ts | 2 +- ios/SSLPinning.mm | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/lib/methods/helpers/sslPinning.ts b/app/lib/methods/helpers/sslPinning.ts index 30b6b4e9f1..6b295567ea 100644 --- 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/SSLPinning.mm b/ios/SSLPinning.mm index 4f3b25a874..fa9b157fdd 100644 --- a/ios/SSLPinning.mm +++ b/ios/SSLPinning.mm @@ -12,6 +12,7 @@ #import #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; From 30db4149ccf4b356d1fd6308c0df8697371921d9 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 12 Feb 2025 14:43:43 -0300 Subject: [PATCH 3/3] Set version to 4.57.1 --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ba890b5f8b..45b56d994a 100644 --- 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.58.0" + versionName "4.57.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 index 465a6ae48d..9c28b3d3b8 100644 --- 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.58.0; + 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.58.0; + 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 index f9405c63de..ee0dc98907 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -28,7 +28,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.58.0 + 4.57.1 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index 688841f420..7029175b2c 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.58.0 + 4.57.1 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index ae072c6ba4..5e2cd14e16 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.58.0", + "version": "4.57.1", "private": true, "scripts": { "start": "react-native start",