From ccee3c056207b06edac364f87f77d92293eaef4e Mon Sep 17 00:00:00 2001 From: GleidsonDaniel Date: Thu, 23 May 2024 18:41:02 -0400 Subject: [PATCH] fix ios build --- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/AppDelegate.mm | 8 ++++++-- ios/SSLPinning.h | 5 ----- ios/SSLPinning.mm | 10 ---------- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index ab1e0870b..2dc9b7159 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -3102,7 +3102,7 @@ EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = NotificationService/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3146,7 +3146,7 @@ EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = NotificationService/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/ios/RocketChatRN/AppDelegate.mm b/ios/RocketChatRN/AppDelegate.mm index 6a74b1fbf..030274a1f 100644 --- a/ios/RocketChatRN/AppDelegate.mm +++ b/ios/RocketChatRN/AppDelegate.mm @@ -24,8 +24,12 @@ [RNNotifications startMonitorNotifications]; [ReplyNotification configure]; - [RNBootSplash initWithStoryboard:@"LaunchScreen" rootView:rootView]; - + self.moduleName = @"RocketChatRN"; + // You can add your custom initial props in the dictionary below. + // They will be passed down to the ViewController used by React Native. + self.initialProps = @{}; + [super application:application didFinishLaunchingWithOptions:launchOptions]; + [RNBootSplash initWithStoryboard:@"LaunchScreen" rootView:self.window.rootViewController.view]; [[[SSLPinning alloc] init] migrate]; self.watchConnection = [[WatchConnection alloc] initWithSession:[WCSession defaultSession]]; diff --git a/ios/SSLPinning.h b/ios/SSLPinning.h index c9ef37efc..50f5ad631 100644 --- a/ios/SSLPinning.h +++ b/ios/SSLPinning.h @@ -7,14 +7,9 @@ // #import -#import "RNFetchBlobRequest.h" NS_ASSUME_NONNULL_BEGIN -@interface RNFetchBlobRequest (Challenge) - -@end - @interface RCTHTTPRequestHandler (Challenge) @end diff --git a/ios/SSLPinning.mm b/ios/SSLPinning.mm index f24d63bef..4f3b25a87 100644 --- a/ios/SSLPinning.mm +++ b/ios/SSLPinning.mm @@ -8,7 +8,6 @@ #import #import "SSLPinning.h" -#import "RNFetchBlobRequest.h" #import #import #import "SecureStorage.h" @@ -113,15 +112,6 @@ } @end -@implementation RNFetchBlobRequest (Challenge) - -- (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credential))completionHandler -{ - [Challenge runChallenge:session didReceiveChallenge:challenge completionHandler:completionHandler]; -} - -@end - @implementation RCTHTTPRequestHandler (Challenge) - (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credential))completionHandler