Allow users to click loading customized buttons.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 4d4d250ebf2359d5515efa6b0e7ecb8eac078e42..5d15213964fa0512b5e4ceabe68d28159948c3f2 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -59,6 +59,10 @@ float CYScrollViewDecelerationRateNormal;
 /* Indirect Delegate {{{ */
 @implementation IndirectDelegate
 
+- (id) delegate {
+    return delegate_;
+}
+
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }
@@ -166,12 +170,16 @@ float CYScrollViewDecelerationRateNormal;
     return url;
 }
 
-- (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
-    return [NSURLRequest
+- (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy referrer:(NSString *)referrer {
+    NSMutableURLRequest *request([NSMutableURLRequest
         requestWithURL:[self URLWithURL:url]
         cachePolicy:policy
         timeoutInterval:DefaultTimeout_
-    ];
+    ]);
+
+    [request setValue:referrer forHTTPHeaderField:@"Referer"];
+
+    return request;
 }
 
 - (void) setRequest:(NSURLRequest *)request {
@@ -180,11 +188,15 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) setURL:(NSURL *)url {
-    [self setRequest:[self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]];
+    [self setURL:url withReferrer:nil];
+}
+
+- (void) setURL:(NSURL *)url withReferrer:(NSString *)referrer {
+    [self setRequest:[self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy referrer:referrer]];
 }
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
-    [self loadRequest:[self requestWithURL:url cachePolicy:policy]];
+    [self loadRequest:[self requestWithURL:url cachePolicy:policy referrer:nil]];
 }
 
 - (void) loadURL:(NSURL *)url {
@@ -212,7 +224,7 @@ float CYScrollViewDecelerationRateNormal;
 
     request_ = request;
 
-    if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
+    if (cache || [request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]
@@ -230,10 +242,6 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
-- (void) reloadURL {
-    [self reloadURLWithCache:YES];
-}
-
 - (void) reloadData {
     [super reloadData];
 
@@ -371,11 +379,20 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
-- (void) pushRequest:(NSURLRequest *)request asPop:(bool)pop {
+- (void) pushRequest:(NSURLRequest *)request forAction:(NSDictionary *)action asPop:(bool)pop {
+    WebFrame *frame(nil);
+    if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"])
+        frame = [WebActionElement objectForKey:@"WebElementFrame"];
+    if (frame == nil)
+        frame = [[[[self webView] _documentView] webView] mainFrame];
+
+    WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]);
+    NSString *referrer([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString]);
+
     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?
-    CyteViewController *page([delegate_ pageForURL:url forExternal:NO]);
+    CyteViewController *page([delegate_ pageForURL:url forExternal:NO withReferrer:referrer]);
 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);
@@ -423,7 +440,7 @@ float CYScrollViewDecelerationRateNormal;
 
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
 #if LogBrowser
-    NSLog(@"decidePolicyForNavigationAction:%@ request:%@ frame:%@", action, request, frame);
+    NSLog(@"decidePolicyForNavigationAction:%@ request:%@ %@ frame:%@", action, request, [request allHTTPHeaderFields], frame);
 #endif
 
     if ([frame parentFrame] == nil) {
@@ -432,7 +449,7 @@ float CYScrollViewDecelerationRateNormal;
 
             if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) {
                 if (url != nil)
-                    [self pushRequest:request asPop:NO];
+                    [self pushRequest:request forAction:action asPop:NO];
                 [listener ignore];
             }
         }
@@ -440,29 +457,45 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
-    if ([frame parentFrame] == nil)
-        if (decision == CYWebPolicyDecisionUse)
-            if (!error_)
-                request_ = request;
+#if LogBrowser
+    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
+#endif
+
+    if ([frame parentFrame] == nil) {
+        switch (decision) {
+            case CYWebPolicyDecisionIgnore:
+                if ([[request_ URL] isEqual:[request URL]])
+                    request_ = nil;
+            break;
+
+            case CYWebPolicyDecisionUse:
+                if (!error_)
+                    request_ = request;
+            break;
+
+            default:
+            break;
+        }
+    }
 }
 
-- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {
 #if LogBrowser
-    NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ newFrameName:%@", action, request, frame);
+    NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ %@ newFrameName:%@", action, request, [request allHTTPHeaderFields], name);
 #endif
 
     NSURL *url([request URL]);
     if (url == nil)
         return;
 
-    if ([frame isEqualToString:@"_open"])
+    if ([name isEqualToString:@"_open"])
         [delegate_ openURL:url];
     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])
             [self _openMailToURL:url];
         else
-            [self pushRequest:request asPop:[frame isEqualToString:@"_popup"]];
+            [self pushRequest:request forAction:action asPop:[name isEqualToString:@"_popup"]];
     }
 
     [listener ignore];
@@ -505,7 +538,7 @@ float CYScrollViewDecelerationRateNormal;
 
     if ([frame parentFrame] == nil) {
         if (DOMDocument *document = [frame DOMDocument])
-            if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
+            if (DOMNodeList *bodies = [document getElementsByTagName:@"body"])
                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 
@@ -601,7 +634,7 @@ float CYScrollViewDecelerationRateNormal;
 // }}}
 
 - (void) close {
-    [[[self navigationController] parentViewController] dismissModalViewControllerAnimated:YES];
+    [[[self navigationController] parentOrPresentingViewController] dismissModalViewControllerAnimated:YES];
 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
@@ -668,7 +701,7 @@ float CYScrollViewDecelerationRateNormal;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;
-    else if (custom_ == [NSNull null])
+    else if ((/*clang:*/id) custom_ == [NSNull null])
         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]
@@ -685,7 +718,7 @@ float CYScrollViewDecelerationRateNormal;
         return nil;
 
     if (UINavigationController *navigation = [self navigationController])
-        if ([[navigation parentViewController] modalViewController] == navigation)
+        if ([[navigation parentOrPresentingViewController] modalViewController] == navigation)
             return [[[UIBarButtonItem alloc]
                 initWithTitle:UCLocalize("CLOSE")
                 style:UIBarButtonItemStylePlain
@@ -842,7 +875,9 @@ float CYScrollViewDecelerationRateNormal;
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];
     [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
-    [preferences setOfflineWebApplicationCacheEnabled:YES];
+
+    if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
+        [preferences setOfflineWebApplicationCacheEnabled:YES];
 
     if (NSString *agent = [self applicationNameForUserAgent])
         [webview setApplicationNameForUserAgent:agent];
@@ -944,7 +979,7 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) reloadButtonClicked {
-    [self reloadURLWithCache:YES];
+    [self reloadURLWithCache:NO];
 }
 
 - (void) _customButtonClicked {