Compile Cydia to arm64 by linking with APT 1.4~b1.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index f047ed3744b934e12a1c65b7db5aaf021e8f4df3..83c8e91edc63190142371602d31fd5d70c0cae65 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -8,7 +8,7 @@
 #include "CyteKit/IndirectDelegate.h"
 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
-#include "CyteKit/PerlCompatibleRegEx.hpp"
+#include "CyteKit/RegEx.hpp"
 #include "CyteKit/WebThreadLocked.hpp"
 
 //#include <QuartzCore/CALayer.h>
@@ -45,11 +45,6 @@ static Class $MFMailComposeViewController;
 
 float CYScrollViewDecelerationRateNormal;
 
-@interface WebView (Apple)
-- (void) _setLayoutInterval:(float)interval;
-- (void) _setAllowsMessaging:(BOOL)allows;
-@end
-
 @interface WebFrame (Cydia)
 - (void) cydia$updateHeight;
 @end
@@ -100,7 +95,7 @@ float CYScrollViewDecelerationRateNormal;
     // XXX: WebThreadCreateNSInvocation returns nil
 
 #if ShowInternals
-    fprintf(stderr, "[%s]R?%s\n", class_getName(self->isa), sel_getName(sel));
+    fprintf(stderr, "[%s]R?%s\n", class_getName(object_getClass(self)), sel_getName(sel));
 #endif
 
     return delegate_ == nil ? NO : [delegate_ respondsToSelector:sel];
@@ -111,7 +106,7 @@ float CYScrollViewDecelerationRateNormal;
         return method;
 
 #if ShowInternals
-    fprintf(stderr, "[%s]S?%s\n", class_getName(self->isa), sel_getName(sel));
+    fprintf(stderr, "[%s]S?%s\n", class_getName(object_getClass(self)), sel_getName(sel));
 #endif
 
     if (delegate_ != nil)
@@ -448,10 +443,10 @@ float CYScrollViewDecelerationRateNormal;
 // CyteWebViewDelegate {{{
 - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
 #if LogMessages
-    static Pcre irritating("^(?"
+    static RegEx irritating("(?"
         ":" "The page at .* displayed insecure content from .*\\."
         "|" "Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\."
-    ")\\n$");
+    ")\\n");
 
     if (NSString *data = [message objectForKey:@"message"])
         if (irritating(data))
@@ -466,10 +461,39 @@ float CYScrollViewDecelerationRateNormal;
     NSLog(@"decidePolicyForNavigationAction:%@ request:%@ %@ frame:%@", action, request, [request allHTTPHeaderFields], frame);
 #endif
 
+    NSURL *url(request == nil ? nil : [request URL]);
+    NSString *scheme([[url scheme] lowercaseString]);
+    NSString *absolute([[url absoluteString] lowercaseString]);
+
+    if (
+        [scheme isEqualToString:@"itms"] ||
+        [scheme isEqualToString:@"itmss"] ||
+        [scheme isEqualToString:@"itms-apps"] ||
+        [scheme isEqualToString:@"itms-appss"] ||
+        [absolute hasPrefix:@"http://itunes.apple.com/"] ||
+        [absolute hasPrefix:@"https://itunes.apple.com/"] ||
+    false) {
+        appstore_ = url;
+
+        UIAlertView *alert = [[[UIAlertView alloc]
+            initWithTitle:UCLocalize("APP_STORE_REDIRECT")
+            message:nil
+            delegate:self
+            cancelButtonTitle:UCLocalize("CANCEL")
+            otherButtonTitles:
+                UCLocalize("ALLOW"),
+            nil
+        ] autorelease];
+
+        [alert setContext:@"itmsappss"];
+        [alert show];
+
+        [listener ignore];
+        return;
+    }
+
     if ([frame parentFrame] == nil) {
         if (!error_) {
-            NSURL *url(request == nil ? nil : [request URL]);
-
             if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) {
                 if (url != nil)
                     [self pushRequest:request forAction:action asPop:NO];
@@ -481,7 +505,7 @@ float CYScrollViewDecelerationRateNormal;
 
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
 #if LogBrowser
-    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
+    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ %@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
 #endif
 
     if ([frame parentFrame] == nil) {
@@ -589,7 +613,7 @@ float CYScrollViewDecelerationRateNormal;
                         }
                     }
 
-                    [self setPageColor:uic];
+                    [super setPageColor:uic];
                     [scroller_ setBackgroundColor:color_];
                     break;
                 }
@@ -687,6 +711,14 @@ float CYScrollViewDecelerationRateNormal;
     return request;
 }
 
+- (NSURLRequest *) webThreadWebView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+#if LogBrowser
+    NSLog(@"resource:%@ willSendRequest:%@ redirectResponse:%@ fromDataSource:%@", identifier, request, response, source);
+#endif
+
+    return request;
+}
+
 - (bool) webView:(WebView *)view shouldRunJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
     return [self _allowJavaScriptPanel];
 }
@@ -739,6 +771,13 @@ float CYScrollViewDecelerationRateNormal;
 
         challenge_ = nil;
 
+        [alert dismissWithClickedButtonIndex:-1 animated:YES];
+    } else if ([context isEqualToString:@"itmsappss"]) {
+        if (button == [alert cancelButtonIndex]) {
+        } else if (button == [alert firstOtherButtonIndex]) {
+            [delegate_ openURL:appstore_];
+        }
+
         [alert dismissWithClickedButtonIndex:-1 animated:YES];
     } else if ([context isEqualToString:@"submit"]) {
         if (button == [alert cancelButtonIndex]) {
@@ -873,7 +912,7 @@ float CYScrollViewDecelerationRateNormal;
         width_ = width;
         class_ = _class;
 
-        [self setPageColor:nil];
+        [super setPageColor:nil];
 
         allowsNavigationAction_ = true;
 
@@ -947,7 +986,7 @@ float CYScrollViewDecelerationRateNormal;
         [preferences _setLayoutInterval:0];
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];
-    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
 
     if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
         [preferences setOfflineWebApplicationCacheEnabled:YES];
@@ -992,7 +1031,7 @@ float CYScrollViewDecelerationRateNormal;
     }
 
     [webview_ setOpaque:NO];
-    [webview_ setBackgroundColor:color_];
+    [webview_ setBackgroundColor:nil];
 
     [scroller_ setFixedBackgroundPattern:YES];
     [scroller_ setBackgroundColor:color_];
@@ -1004,6 +1043,13 @@ float CYScrollViewDecelerationRateNormal;
 
     [self setViewportWidth:width_];
 
+    if ([[UIColor groupTableViewBackgroundColor] isEqual:[UIColor clearColor]]) {
+        UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
+        [table setScrollsToTop:NO];
+        [webview_ insertSubview:table atIndex:0];
+        [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+    }
+
     [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
     ready_ = false;
@@ -1038,16 +1084,34 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
++ (void) _lockJavaScript:(WebPreferences *)preferences {
+    WebThreadLocked lock;
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
+}
+
 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 
     WebView *webview([[[self webView] _documentView] webView]);
-    WebFrame *frame([webview mainFrame]);
+    WebPreferences *preferences([webview preferences]);
 
+    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+    if ([webview respondsToSelector:@selector(_preferencesChanged:)])
+        [webview _preferencesChanged:preferences];
+    else
+        [webview _preferencesChangedNotification:[NSNotification notificationWithName:@"" object:preferences]];
+
+    WebFrame *frame([webview mainFrame]);
     JSGlobalContextRef context([frame globalContext]);
+
     JSObjectRef object([function JSObject]);
     if ($JSObjectCallAsFunction != NULL)
         ($JSObjectCallAsFunction)(context, object, NULL, 0, NULL, NULL);
+
+    // XXX: the JavaScript code submits a form, which seems to happen asynchronously
+    NSObject *target([CyteWebViewController class]);
+    [NSObject cancelPreviousPerformRequestsWithTarget:target selector:@selector(_lockJavaScript:) object:preferences];
+    [target performSelector:@selector(_lockJavaScript:) withObject:preferences afterDelay:1];
 }
 
 - (void) reloadButtonClicked {