From 8dd2c035b019133bbf9c121ab8b64f6326187583 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 19 Dec 2024 15:46:22 -0300 Subject: [PATCH 1/3] chore: Bump version to 4.57.0 (#6074) --- 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 4bf802c038..1d8925248a 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.56.0" + versionName "4.57.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 4013383ecd..84579dae51 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.56.0; + MARKETING_VERSION = 4.57.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.56.0; + MARKETING_VERSION = 4.57.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 125f8501b6..14c9ce19cb 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -28,7 +28,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.56.0 + 4.57.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index 2ce93a820e..5bd34ec3ad 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.56.0 + 4.57.0 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index 23dbee3a6e..0891a5667c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.56.0", + "version": "4.57.0", "private": true, "scripts": { "start": "react-native start", From c53627afccca6971112ed4066b4dc25ec22aa92e Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 7 Jan 2025 14:58:23 -0300 Subject: [PATCH 2/3] fix: Apple Watch app not working with SSL Client Certificate in some cases (#6077) --- ios/SSLPinning/SSLPinning.m | 8 +++++++- ios/SSLPinning/SSLPinning.swift | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ios/SSLPinning/SSLPinning.m b/ios/SSLPinning/SSLPinning.m index 570f9e7be0..3632476de9 100644 --- a/ios/SSLPinning/SSLPinning.m +++ b/ios/SSLPinning/SSLPinning.m @@ -1,3 +1,9 @@ -#import "React/RCTBridgeModule.h" +#import + @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 index 021d7e1117..d8250a5dbf 100644 --- 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 From 5f81d4dc5dbf2fe4741487a258e4937e0d718d8d Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 7 Jan 2025 15:00:49 -0300 Subject: [PATCH 3/3] Set version to 4.56.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 1d8925248a..521e42106b 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.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 index 84579dae51..af7cd37ae4 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.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.57.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 index 14c9ce19cb..fa34654a3d 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -28,7 +28,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.57.0 + 4.56.1 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index 5bd34ec3ad..bd555c501e 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.57.0 + 4.56.1 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index 0891a5667c..247f9bd745 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.57.0", + "version": "4.56.1", "private": true, "scripts": { "start": "react-native start",