You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/12/05 22:52:16 UTC
[1/2] cordova-plugin-wkwebview-engine git commit: CB-11997: Add crash
recovery for iOS 8
Repository: cordova-plugin-wkwebview-engine
Updated Branches:
refs/heads/master 81e889854 -> d5591dece
CB-11997: Add crash recovery for iOS 8
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/commit/d9d30f2c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/tree/d9d30f2c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/diff/d9d30f2c
Branch: refs/heads/master
Commit: d9d30f2cf91f307b44ecc5efe1763ae7d0b3bdb3
Parents: 81e8898
Author: Connor Pearson <cj...@gmail.com>
Authored: Tue Oct 11 14:04:37 2016 -0400
Committer: Connor Pearson <cj...@gmail.com>
Committed: Tue Oct 11 14:04:37 2016 -0400
----------------------------------------------------------------------
src/ios/CDVWKWebViewEngine.m | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/blob/d9d30f2c/src/ios/CDVWKWebViewEngine.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVWKWebViewEngine.m b/src/ios/CDVWKWebViewEngine.m
index 50a872c..9ab0d5c 100644
--- a/src/ios/CDVWKWebViewEngine.m
+++ b/src/ios/CDVWKWebViewEngine.m
@@ -123,6 +123,32 @@
name:UIApplicationWillEnterForegroundNotification object:nil];
NSLog(@"Using WKWebView");
+
+ [self addURLObserver];
+}
+
+- (void)onReset {
+ [self addURLObserver];
+}
+
+static void * KVOContext = &KVOContext;
+
+- (void)addURLObserver {
+ if(![[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 9, .minorVersion = 0, .patchVersion = 0 }]){
+ [self.webView addObserver:self forKeyPath:@"URL" options:0 context:KVOContext];
+ }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context
+{
+ if (context == KVOContext) {
+ if (object == [self webView] && [keyPath isEqualToString: @"URL"] && [object valueForKeyPath:keyPath] == nil){
+ NSLog(@"URL is nil. Reloading WebView");
+ [(WKWebView*)_engineWebView reload];
+ }
+ } else {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
}
- (void) onAppWillEnterForeground:(NSNotification*)notification {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-plugin-wkwebview-engine git commit: CB-11997: Code
review comments
Posted by sh...@apache.org.
CB-11997: Code review comments
This closes #23
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/commit/d5591dec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/tree/d5591dec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/diff/d5591dec
Branch: refs/heads/master
Commit: d5591deceba8936b9bfb7a0d04e60504ed12e407
Parents: d9d30f2
Author: Connor Pearson <cj...@gmail.com>
Authored: Wed Nov 30 07:29:10 2016 -0500
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Dec 5 14:52:07 2016 -0800
----------------------------------------------------------------------
src/ios/CDVWKWebViewEngine.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/blob/d5591dec/src/ios/CDVWKWebViewEngine.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVWKWebViewEngine.m b/src/ios/CDVWKWebViewEngine.m
index 9ab0d5c..e43c7ba 100644
--- a/src/ios/CDVWKWebViewEngine.m
+++ b/src/ios/CDVWKWebViewEngine.m
@@ -134,7 +134,7 @@
static void * KVOContext = &KVOContext;
- (void)addURLObserver {
- if(![[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 9, .minorVersion = 0, .patchVersion = 0 }]){
+ if(!IsAtLeastiOSVersion(@"9.0")){
[self.webView addObserver:self forKeyPath:@"URL" options:0 context:KVOContext];
}
}
@@ -143,7 +143,7 @@ static void * KVOContext = &KVOContext;
{
if (context == KVOContext) {
if (object == [self webView] && [keyPath isEqualToString: @"URL"] && [object valueForKeyPath:keyPath] == nil){
- NSLog(@"URL is nil. Reloading WebView");
+ NSLog(@"URL is nil. Reloading WKWebView");
[(WKWebView*)_engineWebView reload];
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org