Use two rows for Removing Essentials buttons.

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 7cb59797874ea32898ed7f39b11f0de6a4392708..9c85b29703b54a222dc48e52b9a155c2940ab5b3 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -5,6 +5,7 @@
 
 #include "iPhonePrivate.h"
 
+#include "CyteKit/IndirectDelegate.h"
 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/PerlCompatibleRegEx.hpp"
@@ -16,8 +17,8 @@ extern NSString * const kCAFilterNearest;
 
 #include <WebCore/WebCoreThread.h>
 
-#include <WebKit/WebKitErrors.h>
-#include <WebKit/WebPreferences.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebPreferences.h>
 
 #include <WebKit/DOMCSSPrimitiveValue.h>
 #include <WebKit/DOMCSSStyleDeclaration.h>
@@ -47,12 +48,6 @@ float CYScrollViewDecelerationRateNormal;
 - (void) _setAllowsMessaging:(BOOL)allows;
 @end
 
-@interface WebPreferences (Apple)
-+ (void) _setInitialDefaultTextEncodingToSystemEncoding;
-- (void) _setLayoutInterval:(NSInteger)interval;
-- (void) setOfflineWebApplicationCacheEnabled:(BOOL)enabled;
-@end
-
 @implementation WebFrame (Cydia)
 
 - (NSString *) description {
@@ -62,14 +57,6 @@ float CYScrollViewDecelerationRateNormal;
 @end
 
 /* Indirect Delegate {{{ */
-@interface IndirectDelegate : NSObject {
-    _transient volatile id delegate_;
-}
-
-- (void) setDelegate:(id)delegate;
-- (id) initWithDelegate:(id)delegate;
-@end
-
 @implementation IndirectDelegate
 
 - (void) setDelegate:(id)delegate {
@@ -144,13 +131,25 @@ float CYScrollViewDecelerationRateNormal;
         CYScrollViewDecelerationRateNormal = 0.998;
 }
 
+- (bool) retainsNetworkActivityIndicator {
+    return true;
+}
+
+- (void) releaseNetworkActivityIndicator {
+    if ([loading_ count] != 0) {
+        [loading_ removeAllObjects];
+
+        if ([self retainsNetworkActivityIndicator])
+            [delegate_ releaseNetworkActivityIndicator];
+    }
+}
+
 - (void) dealloc {
 #if LogBrowser
     NSLog(@"[CyteWebViewController dealloc]");
 #endif
 
-    if ([loading_ count] != 0)
-        [delegate_ releaseNetworkActivityIndicator];
+    [self releaseNetworkActivityIndicator];
 
     [super dealloc];
 }
@@ -167,12 +166,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 {
@@ -181,11 +184,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 {
@@ -347,7 +354,11 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
-    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+    NSValue *object([NSValue valueWithNonretainedObject:frame]);
+    if (![loading_ containsObject:object])
+        return;
+    [loading_ removeObject:object];
+
     [self _didFinishLoading];
 
     if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled)
@@ -368,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]);
@@ -420,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) {
@@ -429,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];
             }
         }
@@ -443,23 +463,23 @@ float CYScrollViewDecelerationRateNormal;
                 request_ = request;
 }
 
-- (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];
@@ -495,7 +515,10 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {
-    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+    NSValue *object([NSValue valueWithNonretainedObject:frame]);
+    if (![loading_ containsObject:object])
+        return;
+    [loading_ removeObject:object];
 
     if ([frame parentFrame] == nil) {
         if (DOMDocument *document = [frame DOMDocument])
@@ -737,7 +760,9 @@ float CYScrollViewDecelerationRateNormal;
     if ([loading_ count] != 1)
         return;
 
-    [delegate_ retainNetworkActivityIndicator];
+    if ([self retainsNetworkActivityIndicator])
+        [delegate_ retainNetworkActivityIndicator];
+
     [self didStartLoading];
 }
 
@@ -752,7 +777,9 @@ float CYScrollViewDecelerationRateNormal;
     [self applyRightButton];
     [[self navigationItem] setTitle:title_];
 
-    [delegate_ releaseNetworkActivityIndicator];
+    if ([self retainsNetworkActivityIndicator])
+        [delegate_ releaseNetworkActivityIndicator];
+
     [self didFinishLoading];
 }
 
@@ -897,6 +924,8 @@ float CYScrollViewDecelerationRateNormal;
     webview_ = nil;
     scroller_ = nil;
 
+    [self releaseNetworkActivityIndicator];
+
     [super releaseSubviews];
 }
 
@@ -914,6 +943,12 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
+- (id) initWithRequest:(NSURLRequest *)request {
+    if ((self = [self init]) != nil) {
+        [self setRequest:request];
+    } return self;
+}
+
 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 
@@ -1042,6 +1077,9 @@ float CYScrollViewDecelerationRateNormal;
     if ([self hidesNavigationBar])
         [self _setHidesNavigationBar:YES animated:animated];
 
+    // XXX: why isn't this evern called automatically?
+    [[self webView] setNeedsLayout];
+
     [self dispatchEvent:@"CydiaViewWillAppear"];
     [super viewWillAppear:animated];
 }