X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/297566744d63fffb6f2023cd58de7d4b0300a95f..2d5f3bfcb480536bdc9ecca29ce50267078d3f73:/CyteKit/WebViewController.mm diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index b59d8302..d347a396 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -1,6 +1,8 @@ #include "CyteKit/UCPlatform.h" +#include "CyteKit/WebViewController.h" + +#include "CyteKit/MFMailComposeViewController-MailToURL.h" -#include #include "iPhonePrivate.h" #include "CyteKit/Localize.h" @@ -14,6 +16,7 @@ extern NSString * const kCAFilterNearest; #include +#include #include #include @@ -22,6 +25,9 @@ extern NSString * const kCAFilterNearest; #include #include +#include +#include + #define ForSaurik 0 #define DefaultTimeout_ 120.0 @@ -31,13 +37,8 @@ extern NSString * const kCAFilterNearest; #define lprintf(args...) fprintf(stderr, args) -template -static inline void CYRelease(Type_ &value) { - if (value != nil) { - [value release]; - value = nil; - } -} +// XXX: centralize these special class things to some file or mechanism? +static Class $MFMailComposeViewController; float CYScrollViewDecelerationRateNormal; @@ -52,6 +53,14 @@ float CYScrollViewDecelerationRateNormal; - (void) setOfflineWebApplicationCacheEnabled:(BOOL)enabled; @end +@implementation WebFrame (Cydia) + +- (NSString *) description { + return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[[([self provisionalDataSource] ?: [self dataSource]) request] URL] absoluteString]]; +} + +@end + /* Indirect Delegate {{{ */ @interface IndirectDelegate : NSObject { _transient volatile id delegate_; @@ -126,6 +135,9 @@ float CYScrollViewDecelerationRateNormal; + (void) _initialize { [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding]; + dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY); + $MFMailComposeViewController = objc_getClass("MFMailComposeViewController"); + if (float *_UIScrollViewDecelerationRateNormal = reinterpret_cast(dlsym(RTLD_DEFAULT, "UIScrollViewDecelerationRateNormal"))) CYScrollViewDecelerationRateNormal = *_UIScrollViewDecelerationRateNormal; else // XXX: this actually might be fast on some older systems: we should look into this @@ -137,27 +149,18 @@ float CYScrollViewDecelerationRateNormal; NSLog(@"[CyteWebViewController dealloc]"); #endif - [webview_ setDelegate:nil]; - - [indirect_ setDelegate:nil]; - [indirect_ release]; - - if (challenge_ != nil) - [challenge_ release]; - - if (title_ != nil) - [title_ release]; - if ([loading_ count] != 0) [delegate_ releaseNetworkActivityIndicator]; - [loading_ release]; - [reloaditem_ release]; - [loadingitem_ release]; + [super dealloc]; +} - [indicator_ release]; +- (NSString *) description { + return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[request_ URL] absoluteString]]; +} - [super dealloc]; +- (CyteWebView *) webView { + return (CyteWebView *) [self view]; } - (NSURL *) URLWithURL:(NSURL *)url { @@ -172,9 +175,13 @@ float CYScrollViewDecelerationRateNormal; ]; } -- (void) setURL:(NSURL *)url { +- (void) setRequest:(NSURLRequest *)request { _assert(request_ == nil); - request_ = [self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]; + request_ = request; +} + +- (void) setURL:(NSURL *)url { + [self setRequest:[self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]]; } - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy { @@ -191,9 +198,10 @@ float CYScrollViewDecelerationRateNormal; #endif error_ = false; + ready_ = true; WebThreadLocked lock; - [webview_ loadRequest:request]; + [[self webView] loadRequest:request]; } - (void) reloadURLWithCache:(BOOL)cache { @@ -229,7 +237,11 @@ float CYScrollViewDecelerationRateNormal; - (void) reloadData { [super reloadData]; - [self reloadURLWithCache:YES]; + + if (ready_) + [self dispatchEvent:@"CydiaReloadData"]; + else + [self reloadURLWithCache:YES]; } - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { @@ -265,7 +277,7 @@ float CYScrollViewDecelerationRateNormal; } - (void) _setViewportWidth { - [[webview_ _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; + [[[self webView] _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; } - (void) setViewportWidth:(float)width { @@ -285,8 +297,31 @@ float CYScrollViewDecelerationRateNormal; [self _setViewportWidth]; } +- (void) mailComposeController:(MFMailComposeViewController*)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError*)error { + [self dismissModalViewControllerAnimated:YES]; +} + +- (void) _setupMail:(MFMailComposeViewController *)controller { +} + - (void) _openMailToURL:(NSURL *)url { - [[UIApplication sharedApplication] openURL:url];// asPanel:YES]; + if ($MFMailComposeViewController != nil && [$MFMailComposeViewController canSendMail]) { + MFMailComposeViewController *controller([[[$MFMailComposeViewController alloc] init] autorelease]); + [controller setMailComposeDelegate:self]; + + [controller setMailToURL:url]; + + [self _setupMail:controller]; + + [self presentModalViewController:controller animated:YES]; + return; + } + + UIApplication *app([UIApplication sharedApplication]); + if ([app respondsToSelector:@selector(openURL:asPanel:)]) + [app openURL:url asPanel:YES]; + else + [app openURL:url]; } - (bool) _allowJavaScriptPanel { @@ -315,9 +350,14 @@ float CYScrollViewDecelerationRateNormal; [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]]; [self _didFinishLoading]; - if ([error code] == NSURLErrorCancelled) + if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled) return; + if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) { + request_ = nil; + return; + } + if ([frame parentFrame] == nil) { [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@", [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString], @@ -336,7 +376,7 @@ float CYScrollViewDecelerationRateNormal; if (page == nil) { CyteWebViewController *browser([[[class_ alloc] init] autorelease]); - [browser loadRequest:request]; + [browser setRequest:request]; page = browser; } @@ -359,15 +399,17 @@ float CYScrollViewDecelerationRateNormal; ] autorelease]]; [[self navigationController] presentModalViewController:navigation animated:YES]; - - [delegate_ unloadData]; } } // CyteWebViewDelegate {{{ - (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message { #if LogMessages - static Pcre 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$"); + static Pcre 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$"); + if (NSString *data = [message objectForKey:@"message"]) if (irritating(data)) return; @@ -385,9 +427,7 @@ float CYScrollViewDecelerationRateNormal; if (!error_) { NSURL *url(request == nil ? nil : [request URL]); - if (request_ == nil || [self allowsNavigationAction] || [[request_ URL] isEqual:url]) - request_ = request; - else { + if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) { if (url != nil) [self pushRequest:request asPop:NO]; [listener ignore]; @@ -396,6 +436,13 @@ 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; +} + - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id)listener { #if LogBrowser NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ newFrameName:%@", action, request, frame); @@ -421,6 +468,16 @@ float CYScrollViewDecelerationRateNormal; - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { } +- (void) webView:(WebView *)view didCommitLoadForFrame:(WebFrame *)frame { +#if LogBrowser + NSLog(@"didCommitLoadForFrame:%@", frame); +#endif + + if ([frame parentFrame] == nil) { + loaded_ = true; + } +} + - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { #if LogBrowser NSLog(@"didFailLoadWithError:%@ forFrame:%@", error, frame); @@ -481,22 +538,26 @@ float CYScrollViewDecelerationRateNormal; if ([frame parentFrame] != nil) return; - if (title_ != nil) - [title_ autorelease]; - title_ = [title retain]; + title_ = title; [[self navigationItem] setTitle:title_]; } - (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame { +#if LogBrowser + NSLog(@"didStartProvisionalLoadForFrame:%@", frame); +#endif + [loading_ addObject:[NSValue valueWithNonretainedObject:frame]]; if ([frame parentFrame] == nil) { - CYRelease(title_); + title_ = nil; custom_ = nil; style_ = nil; function_ = nil; + allowsNavigationAction_ = true; + [self setHidesNavigationBar:NO]; // XXX: do we still need to do this? @@ -532,7 +593,7 @@ float CYScrollViewDecelerationRateNormal; // }}} - (void) close { - [[self navigationController] dismissModalViewControllerAnimated:YES]; + [[[self navigationController] parentViewController] dismissModalViewControllerAnimated:YES]; } - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button { @@ -570,7 +631,6 @@ float CYScrollViewDecelerationRateNormal; _nodefault } - [challenge_ release]; challenge_ = nil; [alert dismissWithClickedButtonIndex:-1 animated:YES]; @@ -579,7 +639,7 @@ float CYScrollViewDecelerationRateNormal; } else if (button == [alert firstOtherButtonIndex]) { if (request_ != nil) { WebThreadLocked lock; - [webview_ loadRequest:request_]; + [[self webView] loadRequest:request_]; } } @@ -611,6 +671,27 @@ float CYScrollViewDecelerationRateNormal; ] autorelease]; } +- (UIBarButtonItem *) leftButton { + UINavigationItem *item([self navigationItem]); + if ([item backBarButtonItem] != nil && ![item hidesBackButton]) + return nil; + + if (UINavigationController *navigation = [self navigationController]) + if ([[navigation parentViewController] modalViewController] == navigation) + return [[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CLOSE") + style:UIBarButtonItemStylePlain + target:self + action:@selector(close) + ] autorelease]; + + return nil; +} + +- (void) applyLeftButton { + [[self navigationItem] setLeftBarButtonItem:[self leftButton]]; +} + - (UIBarButtonItem *) rightButton { return reloaditem_; } @@ -640,7 +721,7 @@ float CYScrollViewDecelerationRateNormal; else if (button == (UIBarButtonItem *) [NSNull null]) button = nil; - [[self navigationItem] setRightBarButtonItem:button]; + [[self navigationItem] setRightBarButtonItem:button animated:YES]; } } @@ -679,115 +760,142 @@ float CYScrollViewDecelerationRateNormal; - (id) initWithWidth:(float)width ofClass:(Class)_class { if ((self = [super init]) != nil) { + width_ = width; + class_ = _class; + allowsNavigationAction_ = true; - class_ = _class; - loading_ = [[NSMutableSet alloc] initWithCapacity:5]; + loading_ = [NSMutableSet setWithCapacity:5]; + indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease]; - indirect_ = [[IndirectDelegate alloc] initWithDelegate:self]; + reloaditem_ = [[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("RELOAD") + style:[self rightButtonStyle] + target:self + action:@selector(reloadButtonClicked) + ] autorelease]; - CGRect bounds([[self view] bounds]); + loadingitem_ = [[[UIBarButtonItem alloc] + initWithTitle:@" " + style:UIBarButtonItemStylePlain + target:self + action:@selector(reloadButtonClicked) + ] autorelease]; + + indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease]; + [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease]; - [webview_ setDelegate:self]; - [self setView:webview_]; + [self applyLeftButton]; + [self applyRightButton]; + } return self; +} - if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)]) - [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic]; - else - [webview_ setDetectsPhoneNumbers:NO]; +- (NSString *) applicationNameForUserAgent { + return nil; +} + +- (void) loadView { + CGRect bounds([[UIScreen mainScreen] applicationFrame]); + + webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease]; + [webview_ setDelegate:self]; + [self setView:webview_]; - [webview_ setScalesPageToFit:YES]; + if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)]) + [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic]; + else + [webview_ setDetectsPhoneNumbers:NO]; + + [webview_ setScalesPageToFit:YES]; + + UIWebDocumentView *document([webview_ _documentView]); + + // XXX: I think this improves scrolling; the hardcoded-ness sucks + [document setTileSize:CGSizeMake(320, 500)]; - UIWebDocumentView *document([webview_ _documentView]); + [document setBackgroundColor:[UIColor clearColor]]; - // XXX: I think this improves scrolling; the hardcoded-ness sucks - [document setTileSize:CGSizeMake(320, 500)]; + // XXX: this is terribly (too?) expensive + [document setDrawsBackground:NO]; - [document setBackgroundColor:[UIColor clearColor]]; + WebView *webview([document webView]); + WebPreferences *preferences([webview preferences]); - // XXX: this is terribly (too?) expensive - [document setDrawsBackground:NO]; + // XXX: I have no clue if I actually /want/ this modification + if ([webview respondsToSelector:@selector(_setLayoutInterval:)]) + [webview _setLayoutInterval:0]; + else if ([preferences respondsToSelector:@selector(_setLayoutInterval:)]) + [preferences _setLayoutInterval:0]; - WebView *webview([document webView]); - WebPreferences *preferences([webview preferences]); + [preferences setCacheModel:WebCacheModelDocumentBrowser]; + [preferences setJavaScriptCanOpenWindowsAutomatically:YES]; + [preferences setOfflineWebApplicationCacheEnabled:YES]; - // XXX: I have no clue if I actually /want/ this modification - if ([webview respondsToSelector:@selector(_setLayoutInterval:)]) - [webview _setLayoutInterval:0]; - else if ([preferences respondsToSelector:@selector(_setLayoutInterval:)]) - [preferences _setLayoutInterval:0]; + if (NSString *agent = [self applicationNameForUserAgent]) + [webview setApplicationNameForUserAgent:agent]; - [preferences setCacheModel:WebCacheModelDocumentBrowser]; - [preferences setOfflineWebApplicationCacheEnabled:YES]; + if ([webview respondsToSelector:@selector(setShouldUpdateWhileOffscreen:)]) + [webview setShouldUpdateWhileOffscreen:NO]; #if LogMessages - if ([document respondsToSelector:@selector(setAllowsMessaging:)]) - [document setAllowsMessaging:YES]; - if ([webview respondsToSelector:@selector(_setAllowsMessaging:)]) - [webview _setAllowsMessaging:YES]; + if ([document respondsToSelector:@selector(setAllowsMessaging:)]) + [document setAllowsMessaging:YES]; + if ([webview respondsToSelector:@selector(_setAllowsMessaging:)]) + [webview _setAllowsMessaging:YES]; #endif - if ([webview_ respondsToSelector:@selector(_scrollView)]) { - scroller_ = [webview_ _scrollView]; + if ([webview_ respondsToSelector:@selector(_scrollView)]) { + scroller_ = [webview_ _scrollView]; - [scroller_ setDirectionalLockEnabled:YES]; - [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal]; - [scroller_ setDelaysContentTouches:NO]; + [scroller_ setDirectionalLockEnabled:YES]; + [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal]; + [scroller_ setDelaysContentTouches:NO]; - [scroller_ setCanCancelContentTouches:YES]; - } else if ([webview_ respondsToSelector:@selector(_scroller)]) { - UIScroller *scroller([webview_ _scroller]); - scroller_ = (UIScrollView *) scroller; + [scroller_ setCanCancelContentTouches:YES]; + } else if ([webview_ respondsToSelector:@selector(_scroller)]) { + UIScroller *scroller([webview_ _scroller]); + scroller_ = (UIScrollView *) scroller; - [scroller setDirectionalScrolling:YES]; - // XXX: we might be better off /not/ setting this on older systems - [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */ - [scroller setScrollHysteresis:0]; /* 8 */ + [scroller setDirectionalScrolling:YES]; + // XXX: we might be better off /not/ setting this on older systems + [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */ + [scroller setScrollHysteresis:0]; /* 8 */ - [scroller setThumbDetectionEnabled:NO]; + [scroller setThumbDetectionEnabled:NO]; - // use NO with UIApplicationUseLegacyEvents(YES) - [scroller setEventMode:YES]; + // use NO with UIApplicationUseLegacyEvents(YES) + [scroller setEventMode:YES]; - // XXX: this is handled by setBounces, right? - //[scroller setAllowsRubberBanding:YES]; - } + // XXX: this is handled by setBounces, right? + //[scroller setAllowsRubberBanding:YES]; + } - [scroller_ setFixedBackgroundPattern:YES]; - [scroller_ setBackgroundColor:[UIColor clearColor]]; - [scroller_ setClipsSubviews:YES]; + [scroller_ setFixedBackgroundPattern:YES]; + [scroller_ setBackgroundColor:[UIColor clearColor]]; + [scroller_ setClipsSubviews:YES]; - [scroller_ setBounces:YES]; - [scroller_ setScrollingEnabled:YES]; - [scroller_ setShowBackgroundShadow:NO]; + [scroller_ setBounces:YES]; + [scroller_ setScrollingEnabled:YES]; + [scroller_ setShowBackgroundShadow:NO]; - [self setViewportWidth:width]; + [self setViewportWidth:width_]; - reloaditem_ = [[UIBarButtonItem alloc] - initWithTitle:UCLocalize("RELOAD") - style:[self rightButtonStyle] - target:self - action:@selector(reloadButtonClicked) - ]; + UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]); + [table setScrollsToTop:NO]; + [webview_ insertSubview:table atIndex:0]; - loadingitem_ = [[UIBarButtonItem alloc] - initWithTitle:@" " - style:UIBarButtonItemStylePlain - target:self - action:@selector(reloadButtonClicked) - ]; + [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - indicator_ = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + ready_ = false; +} - UITableView *table([[[UITableView alloc] initWithFrame:bounds style:UITableViewStyleGrouped] autorelease]); - [webview_ insertSubview:table atIndex:0]; +- (void) releaseSubviews { + webview_ = nil; + scroller_ = nil; - [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - } return self; + [super releaseSubviews]; } - (id) initWithWidth:(float)width { @@ -807,37 +915,12 @@ float CYScrollViewDecelerationRateNormal; - (void) callFunction:(WebScriptObject *)function { WebThreadLocked lock; - WebView *webview([[webview_ _documentView] webView]); + WebView *webview([[[self webView] _documentView] webView]); WebFrame *frame([webview mainFrame]); - WebPreferences *preferences([webview preferences]); - - bool maybe([preferences javaScriptCanOpenWindowsAutomatically]); - [preferences setJavaScriptCanOpenWindowsAutomatically:NO]; - - /*id _private(MSHookIvar(webview, "_private")); - WebCore::Page *page(_private == nil ? NULL : MSHookIvar(_private, "page")); - WebCore::Settings *settings(page == NULL ? NULL : page->settings()); - bool no; - if (settings == NULL) - no = 0; - else { - no = settings->JavaScriptCanOpenWindowsAutomatically(); - settings->setJavaScriptCanOpenWindowsAutomatically(true); - }*/ - - if (UIWindow *window = [[self view] window]) - if (UIResponder *responder = [window firstResponder]) - [responder resignFirstResponder]; - - JSObjectRef object([function JSObject]); JSGlobalContextRef context([frame globalContext]); + JSObjectRef object([function JSObject]); JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL); - - /*if (settings != NULL) - settings->setJavaScriptCanOpenWindowsAutomatically(no);*/ - - [preferences setJavaScriptCanOpenWindowsAutomatically:maybe]; } - (void) reloadButtonClicked { @@ -881,6 +964,7 @@ float CYScrollViewDecelerationRateNormal; - (void) setHidesBackButton:(bool)value { [[self navigationItem] setHidesBackButton:value]; + [self applyLeftButton]; } - (void) setHidesBackButtonByNumber:(NSNumber *)value { @@ -888,7 +972,7 @@ float CYScrollViewDecelerationRateNormal; } - (void) dispatchEvent:(NSString *)event { - [webview_ dispatchEvent:event]; + [[self webView] dispatchEvent:event]; } - (bool) hidesNavigationBar {