From b77d68c23dd168caacd11e86e234bcac49aff0ca Mon Sep 17 00:00:00 2001 From: ruslan-bikkinin Date: Thu, 8 Oct 2020 18:36:25 +0300 Subject: [PATCH] WIP --- src/ios/CDVViewController+CodePush.m | 2 +- src/ios/CodePush.m | 2 +- src/ios/Utilities.h | 1 + src/ios/Utilities.m | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ios/CDVViewController+CodePush.m b/src/ios/CDVViewController+CodePush.m index c34e6999..718e5a70 100644 --- a/src/ios/CDVViewController+CodePush.m +++ b/src/ios/CDVViewController+CodePush.m @@ -40,7 +40,7 @@ - (void)viewDidLoad { Note 1: self.webViewEngine loadRequest will be failing anyway but calling [webViewShared loadRequest] will hide it for user. Note 2: It affects only cordova-ios 6 apps */ - if([Utilities Cordova6OrGreater]) { + if([Utilities cordova6OrGreater]) { WebViewShared* webViewShared = [WebViewShared getInstanceOrCreate:self.webViewEngine andCommandDelegate:self.commandDelegate andViewController:self]; diff --git a/src/ios/CodePush.m b/src/ios/CodePush.m index bb94c916..7a6950c0 100644 --- a/src/ios/CodePush.m +++ b/src/ios/CodePush.m @@ -408,7 +408,7 @@ - (BOOL)loadPackage:(NSString*)packageLocation { - (void)loadURL:(NSURL*)url { // Fix file:// requests issues for cordova-ios 6+ - if([Utilities Cordova6OrGreater]) { + if([Utilities cordova6OrGreater]) { [webViewShared loadRequest:[NSURLRequest requestWithURL:url]]; } else { // In order to make use of the "modern" Cordova platform, while still diff --git a/src/ios/Utilities.h b/src/ios/Utilities.h index c776d390..a9d0f506 100644 --- a/src/ios/Utilities.h +++ b/src/ios/Utilities.h @@ -3,5 +3,6 @@ + (NSString*)getApplicationVersion; + (NSString*)getApplicationTimestamp; + (NSDate*)getApplicationBuildTime; ++ (BOOL)cordova6OrGreater; @end \ No newline at end of file diff --git a/src/ios/Utilities.m b/src/ios/Utilities.m index aec09c09..318c3673 100644 --- a/src/ios/Utilities.m +++ b/src/ios/Utilities.m @@ -24,6 +24,10 @@ + (NSDate*)getApplicationBuildTime{ return fileDate; } ++ (BOOL)cordova6OrGreater{ + return NSClassFromString(@"CDVWebViewEngine"); +} + void CPLog(NSString *formatString, ...) { va_list args; va_start(args, formatString);