X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/7b33d20196938812433b59a8b8d6ebaf4758df40..2e362598168e73f935146b3b7ec4318390651cc6:/CyteKit/WebViewController.mm?ds=inline diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index 496d8b21..9d1866a6 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -1,14 +1,14 @@ #include "CyteKit/UCPlatform.h" -#include "CyteKit/WebViewController.h" +#include "CyteKit/IndirectDelegate.h" +#include "CyteKit/Localize.h" #include "CyteKit/MFMailComposeViewController-MailToURL.h" +#include "CyteKit/RegEx.hpp" +#include "CyteKit/WebThreadLocked.hpp" +#include "CyteKit/WebViewController.h" #include "iPhonePrivate.h" - -#include "CyteKit/Localize.h" -#include "CyteKit/WebViewController.h" -#include "CyteKit/PerlCompatibleRegEx.hpp" -#include "CyteKit/WebThreadLocked.hpp" +#include //#include // XXX: fix the minimum requirement @@ -16,14 +16,10 @@ extern NSString * const kCAFilterNearest; #include -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include "Substrate.hpp" #define ForSaurik 0 #define DefaultTimeout_ 120.0 @@ -34,33 +30,91 @@ extern NSString * const kCAFilterNearest; #define lprintf(args...) fprintf(stderr, args) +JSValueRef (*$JSObjectCallAsFunction)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *); + // XXX: centralize these special class things to some file or mechanism? static Class $MFMailComposeViewController; float CYScrollViewDecelerationRateNormal; -@interface WebView (Apple) -- (void) _setLayoutInterval:(float)interval; -- (void) _setAllowsMessaging:(BOOL)allows; +@interface WebFrame (Cydia) +- (void) cydia$updateHeight; @end -@interface WebPreferences (Apple) -+ (void) _setInitialDefaultTextEncodingToSystemEncoding; -- (void) _setLayoutInterval:(NSInteger)interval; -- (void) setOfflineWebApplicationCacheEnabled:(BOOL)enabled; -@end +@implementation WebFrame (Cydia) -/* Indirect Delegate {{{ */ -@interface IndirectDelegate : NSObject { - _transient volatile id delegate_; +- (NSString *) description { + return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[[([self provisionalDataSource] ?: [self dataSource]) request] URL] absoluteString]]; +} + +- (void) cydia$updateHeight { + [[[self frameElement] style] + setProperty:@"height" + value:[NSString stringWithFormat:@"%dpx", + [[[self DOMDocument] body] scrollHeight]] + priority:nil]; } -- (void) setDelegate:(id)delegate; -- (id) initWithDelegate:(id)delegate; @end +// Diversion {{{ +static _H Diversions_; + +@implementation Diversion { + RegEx pattern_; + _H key_; + _H format_; +} + +- (id) initWithFrom:(NSString *)from to:(NSString *)to { + if ((self = [super init]) != nil) { + pattern_ = [from UTF8String]; + key_ = from; + format_ = to; + } return self; +} + +- (NSString *) divert:(NSString *)url { + return !pattern_(url) ? nil : pattern_->*format_; +} + ++ (NSURL *) divertURL:(NSURL *)url { + divert: + NSString *href([url absoluteString]); + + for (Diversion *diversion in (id) Diversions_) + if (NSString *diverted = [diversion divert:href]) { +#if !ForRelease + NSLog(@"div: %@", diverted); +#endif + url = [NSURL URLWithString:diverted]; + goto divert; + } + + return url; +} + +- (NSString *) key { + return key_; +} + +- (NSUInteger) hash { + return [key_ hash]; +} + +- (BOOL) isEqual:(Diversion *)object { + return self == object || [self class] == [object class] && [key_ isEqual:[object key]]; +} + +@end +// }}} +/* Indirect Delegate {{{ */ @implementation IndirectDelegate +- (id) delegate { + return delegate_; +} + - (void) setDelegate:(id)delegate { delegate_ = delegate; } @@ -84,7 +138,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]; @@ -95,7 +149,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) @@ -115,7 +169,43 @@ float CYScrollViewDecelerationRateNormal; @end /* }}} */ -@implementation CyteWebViewController +@implementation CyteWebViewController { + _H webview_; + _transient UIScrollView *scroller_; + + _H indicator_; + _H indirect_; + _H challenge_; + + bool error_; + _H request_; + bool ready_; + + _transient NSNumber *sensitive_; + _H appstore_; + + _H title_; + _H loading_; + + _H registered_; + _H timer_; + + // XXX: NSString * or UIImage * + _H custom_; + _H style_; + + _H function_; + + float width_; + Class class_; + + _H reloaditem_; + _H loadingitem_; + + bool visible_; + bool hidesNavigationBar_; + bool allowsNavigationAction_; +} #if ShowInternals #include "CyteKit/UCInternal.h" @@ -124,13 +214,36 @@ float CYScrollViewDecelerationRateNormal; + (void) _initialize { [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding]; + void *js(NULL); + if (js == NULL) + js = dlopen("/System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY); + if (js == NULL) + js = dlopen("/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY); + if (js != NULL) + $JSObjectCallAsFunction = reinterpret_cast(dlsym(js, "JSObjectCallAsFunction")); + dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY); $MFMailComposeViewController = objc_getClass("MFMailComposeViewController"); - if (float *_UIScrollViewDecelerationRateNormal = reinterpret_cast(dlsym(RTLD_DEFAULT, "UIScrollViewDecelerationRateNormal"))) + if (CGFloat *_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 CYScrollViewDecelerationRateNormal = 0.998; + + Diversions_ = [NSMutableSet setWithCapacity:0]; +} + +- (bool) retainsNetworkActivityIndicator { + return true; +} + +- (void) releaseNetworkActivityIndicator { + if ([loading_ count] != 0) { + [loading_ removeAllObjects]; + + if ([self retainsNetworkActivityIndicator]) + [self.delegate releaseNetworkActivityIndicator]; + } } - (void) dealloc { @@ -138,34 +251,62 @@ float CYScrollViewDecelerationRateNormal; NSLog(@"[CyteWebViewController dealloc]"); #endif - [webview_ setDelegate:nil]; - [indirect_ setDelegate:nil]; - - if ([loading_ count] != 0) - [delegate_ releaseNetworkActivityIndicator]; + [self releaseNetworkActivityIndicator]; [super dealloc]; } +- (NSString *) description { + return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[request_ URL] absoluteString]]; +} + +- (CyteWebView *) webView { + return (CyteWebView *) [self view]; +} + +- (CyteWebViewController *) indirect { + return (CyteWebViewController *) (IndirectDelegate *) indirect_; +} + ++ (void) addDiversion:(Diversion *)diversion { + [Diversions_ addObject:diversion]; +} + - (NSURL *) URLWithURL:(NSURL *)url { - return url; + return [Diversion divertURL: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) setURL:(NSURL *)url { +- (void) setRequest:(NSURLRequest *)request { _assert(request_ == nil); - request_ = [self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]; + request_ = request; +} + +- (NSURLRequest *) request { + return request_; +} + +- (void) setURL:(NSURL *)url { + [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 { @@ -178,9 +319,10 @@ float CYScrollViewDecelerationRateNormal; #endif error_ = false; + ready_ = true; WebThreadLocked lock; - [webview_ loadRequest:request]; + [[self webView] loadRequest:request]; } - (void) reloadURLWithCache:(BOOL)cache { @@ -192,7 +334,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] @@ -210,13 +352,13 @@ float CYScrollViewDecelerationRateNormal; } } -- (void) reloadURL { - [self reloadURLWithCache:YES]; -} - - (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 { @@ -252,7 +394,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 { @@ -276,6 +418,9 @@ float CYScrollViewDecelerationRateNormal; [self dismissModalViewControllerAnimated:YES]; } +- (void) _setupMail:(MFMailComposeViewController *)controller { +} + - (void) _openMailToURL:(NSURL *)url { if ($MFMailComposeViewController != nil && [$MFMailComposeViewController canSendMail]) { MFMailComposeViewController *controller([[[$MFMailComposeViewController alloc] init] autorelease]); @@ -283,6 +428,8 @@ float CYScrollViewDecelerationRateNormal; [controller setMailToURL:url]; + [self _setupMail:controller]; + [self presentModalViewController:controller animated:YES]; return; } @@ -317,16 +464,18 @@ 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) return; if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) { - request_ = (id) stage2_; - stage1_ = nil; - stage2_ = nil; + request_ = nil; return; } @@ -340,19 +489,29 @@ 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([self.delegate pageForURL:url forExternal:NO withReferrer:referrer]); if (page == nil) { CyteWebViewController *browser([[[class_ alloc] init] autorelease]); - [browser loadRequest:request]; + [browser setRequest:request]; page = browser; } - [page setDelegate:delegate_]; + [page setDelegate:self.delegate]; + [page setPageColor:self.pageColor]; if (!pop) { [[self navigationItem] setTitle:title_]; @@ -361,7 +520,7 @@ float CYScrollViewDecelerationRateNormal; } else { UINavigationController *navigation([[[UINavigationController alloc] initWithRootViewController:page] autorelease]); - [navigation setDelegate:delegate_]; + [navigation setDelegate:self.delegate]; [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:UCLocalize("CLOSE") @@ -370,8 +529,6 @@ float CYScrollViewDecelerationRateNormal; action:@selector(close) ] autorelease]]; - [delegate_ unloadData]; - [[self navigationController] presentModalViewController:navigation animated:YES]; } } @@ -379,10 +536,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)) @@ -394,16 +551,45 @@ float CYScrollViewDecelerationRateNormal; - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id)listener { #if LogBrowser - NSLog(@"decidePolicyForNavigationAction:%@ request:%@ frame:%@", action, request, frame); + 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 asPop:NO]; + [self pushRequest:request forAction:action asPop:NO]; [listener ignore]; } } @@ -411,37 +597,63 @@ 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_) { - stage1_ = (id) request_; - 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)listener { +- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id)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"]) - [delegate_ openURL:url]; + if ([name isEqualToString:@"_open"]) + [self.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]; } - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { +#if LogBrowser + NSLog(@"didClearWindowObject:%@ forFrame:%@", window, frame); +#endif +} + +- (void) webView:(WebView *)view didCommitLoadForFrame:(WebFrame *)frame { +#if LogBrowser + NSLog(@"didCommitLoadForFrame:%@", frame); +#endif + + if ([frame parentFrame] == nil) { + } } - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { @@ -461,14 +673,14 @@ 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) { - stage1_ = nil; - stage2_ = nil; - if (DOMDocument *document = [frame DOMDocument]) - if (DOMNodeList *bodies = [document getElementsByTagName:@"body"]) + if (DOMNodeList *bodies = [document getElementsByTagName:@"body"]) for (DOMHTMLBodyElement *body in (id) bodies) { DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]); @@ -483,9 +695,7 @@ float CYScrollViewDecelerationRateNormal; float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]); float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]); - if (red == 0xc7 && green == 0xce && blue == 0xd5) - uic = [UIColor pinStripeColor]; - else if (alpha != 0) + if (alpha == 1) uic = [UIColor colorWithRed:(red / 255) green:(green / 255) @@ -495,7 +705,8 @@ float CYScrollViewDecelerationRateNormal; } } - [scroller_ setBackgroundColor:(uic ?: [UIColor clearColor])]; + [super setPageColor:uic]; + [scroller_ setBackgroundColor:self.pageColor]; break; } } @@ -525,10 +736,14 @@ float CYScrollViewDecelerationRateNormal; style_ = nil; function_ = nil; - stage2_ = (id) stage1_; - stage1_ = nil; + [registered_ removeAllObjects]; + timer_ = nil; + + allowsNavigationAction_ = true; [self setHidesNavigationBar:NO]; + [self setScrollAlwaysBounceVertical:true]; + [self setScrollIndicatorStyle:UIScrollViewIndicatorStyleDefault]; // XXX: do we still need to do this? [[self navigationItem] setTitle:nil]; @@ -537,6 +752,49 @@ float CYScrollViewDecelerationRateNormal; [self _didStartLoading]; } +- (void) webView:(WebView *)view resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)source { + challenge_ = [challenge retain]; + + NSURLProtectionSpace *space([challenge protectionSpace]); + NSString *realm([space realm]); + if (realm == nil) + realm = @""; + + UIAlertView *alert = [[[UIAlertView alloc] + initWithTitle:realm + message:nil + delegate:self + cancelButtonTitle:UCLocalize("CANCEL") + otherButtonTitles:UCLocalize("LOGIN"), nil + ] autorelease]; + + [alert setContext:@"challenge"]; + [alert setNumberOfRows:1]; + + [alert addTextFieldWithValue:@"" label:UCLocalize("USERNAME")]; + [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")]; + + UITextField *username([alert textFieldAtIndex:0]); { + NSObject *traits([username textInputTraits]); + [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; + [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; + [traits setKeyboardType:UIKeyboardTypeASCIICapable]; + [traits setReturnKeyType:UIReturnKeyNext]; + } + + UITextField *password([alert textFieldAtIndex:1]); { + NSObject *traits([password textInputTraits]); + [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone]; + [traits setAutocorrectionType:UITextAutocorrectionTypeNo]; + [traits setKeyboardType:UIKeyboardTypeASCIICapable]; + // XXX: UIReturnKeyDone + [traits setReturnKeyType:UIReturnKeyNext]; + [traits setSecureTextEntry:YES]; + } + + [alert show]; +} + - (NSURLRequest *) webView:(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); @@ -545,6 +803,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]; } @@ -563,7 +829,7 @@ float CYScrollViewDecelerationRateNormal; // }}} - (void) close { - [[self navigationController] dismissModalViewControllerAnimated:YES]; + [[[self navigationController] parentOrPresentingViewController] dismissModalViewControllerAnimated:YES]; } - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button { @@ -584,32 +850,33 @@ float CYScrollViewDecelerationRateNormal; } else if ([context isEqualToString:@"challenge"]) { id sender([challenge_ sender]); - switch (button) { - case 1: { - NSString *username([[alert textFieldAtIndex:0] text]); - NSString *password([[alert textFieldAtIndex:1] text]); - - NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]); + if (button == [alert cancelButtonIndex]) + [sender cancelAuthenticationChallenge:challenge_]; + else if (button == [alert firstOtherButtonIndex]) { + NSString *username([[alert textFieldAtIndex:0] text]); + NSString *password([[alert textFieldAtIndex:1] text]); - [sender useCredential:credential forAuthenticationChallenge:challenge_]; - } break; + NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]); - case 2: - [sender cancelAuthenticationChallenge:challenge_]; - break; - - _nodefault + [sender useCredential:credential forAuthenticationChallenge:challenge_]; } challenge_ = nil; + [alert dismissWithClickedButtonIndex:-1 animated:YES]; + } else if ([context isEqualToString:@"itmsappss"]) { + if (button == [alert cancelButtonIndex]) { + } else if (button == [alert firstOtherButtonIndex]) { + [self.delegate openURL:appstore_]; + } + [alert dismissWithClickedButtonIndex:-1 animated:YES]; } else if ([context isEqualToString:@"submit"]) { if (button == [alert cancelButtonIndex]) { } else if (button == [alert firstOtherButtonIndex]) { if (request_ != nil) { WebThreadLocked lock; - [webview_ loadRequest:request_]; + [[self webView] loadRequest:request_]; } } @@ -629,9 +896,9 @@ float CYScrollViewDecelerationRateNormal; - (UIBarButtonItem *) customButton { if (custom_ == nil) + return [self rightButton]; + else if ((/*clang:*/id) custom_ == [NSNull null]) return nil; - else if (custom_ == [NSNull null]) - return (UIBarButtonItem *) [NSNull null]; return [[[UIBarButtonItem alloc] initWithTitle:static_cast(custom_.operator NSObject *()) @@ -647,7 +914,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 @@ -684,14 +951,7 @@ float CYScrollViewDecelerationRateNormal; [self applyLoadingTitle]; } else { [indicator_ stopAnimating]; - - UIBarButtonItem *button([self customButton]); - if (button == nil) - button = [self rightButton]; - else if (button == (UIBarButtonItem *) [NSNull null]) - button = nil; - - [[self navigationItem] setRightBarButtonItem:button]; + [[self navigationItem] setRightBarButtonItem:[self customButton] animated:YES]; } } @@ -705,7 +965,9 @@ float CYScrollViewDecelerationRateNormal; if ([loading_ count] != 1) return; - [delegate_ retainNetworkActivityIndicator]; + if ([self retainsNetworkActivityIndicator]) + [self.delegate retainNetworkActivityIndicator]; + [self didStartLoading]; } @@ -720,7 +982,9 @@ float CYScrollViewDecelerationRateNormal; [self applyRightButton]; [[self navigationItem] setTitle:title_]; - [delegate_ releaseNetworkActivityIndicator]; + if ([self retainsNetworkActivityIndicator]) + [self.delegate releaseNetworkActivityIndicator]; + [self didFinishLoading]; } @@ -730,119 +994,164 @@ float CYScrollViewDecelerationRateNormal; - (id) initWithWidth:(float)width ofClass:(Class)_class { if ((self = [super init]) != nil) { + width_ = width; + class_ = _class; + + [super setPageColor:nil]; + allowsNavigationAction_ = true; - class_ = _class; loading_ = [NSMutableSet setWithCapacity:5]; - + registered_ = [NSMutableSet setWithCapacity:5]; indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease]; - CGRect bounds([[self view] bounds]); + reloaditem_ = [[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("RELOAD") + style:[self rightButtonStyle] + target:self + action:@selector(reloadButtonClicked) + ] autorelease]; - webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease]; - [webview_ setDelegate:self]; - [self setView:webview_]; + loadingitem_ = [[[UIBarButtonItem alloc] + initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @" " : @" ") + style:UIBarButtonItemStylePlain + target:self + action:@selector(customButtonClicked) + ] autorelease]; - if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)]) - [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic]; - else - [webview_ setDetectsPhoneNumbers:NO]; + UIActivityIndicatorViewStyle style; + float left; + if (kCFCoreFoundationVersionNumber >= 800) { + style = UIActivityIndicatorViewStyleGray; + left = 7; + } else { + style = UIActivityIndicatorViewStyleWhite; + left = 15; + } + + indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:style] autorelease]; + [indicator_ setFrame:CGRectMake(left, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; + + [self applyLeftButton]; + [self applyRightButton]; + } return self; +} + +static _H UserAgent_; ++ (void) setApplicationNameForUserAgent:(NSString *)userAgent { + UserAgent_ = userAgent; +} + +- (NSString *) applicationNameForUserAgent { + return UserAgent_; +} - [webview_ setScalesPageToFit:YES]; +- (void) loadView { + CGRect bounds([[UIScreen mainScreen] applicationFrame]); - UIWebDocumentView *document([webview_ _documentView]); + webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease]; + [webview_ setDelegate:self]; + [self setView:webview_]; - // XXX: I think this improves scrolling; the hardcoded-ness sucks - [document setTileSize:CGSizeMake(320, 500)]; + if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)]) + [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic]; + else + [webview_ setDetectsPhoneNumbers:NO]; - [document setBackgroundColor:[UIColor clearColor]]; + [webview_ setScalesPageToFit:YES]; - // XXX: this is terribly (too?) expensive - [document setDrawsBackground:NO]; + UIWebDocumentView *document([webview_ _documentView]); - WebView *webview([document webView]); - WebPreferences *preferences([webview preferences]); + // XXX: I think this improves scrolling; the hardcoded-ness sucks + [document setTileSize:CGSizeMake(320, 500)]; - // 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]; + // 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]; + + [preferences setCacheModel:WebCacheModelDocumentBrowser]; + [preferences setJavaScriptCanOpenWindowsAutomatically:NO]; + + if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)]) [preferences setOfflineWebApplicationCacheEnabled:YES]; + if (NSString *agent = [self applicationNameForUserAgent]) + [webview setApplicationNameForUserAgent:agent]; + + 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]; + [webview_ setOpaque:NO]; + [webview_ setBackgroundColor:nil]; - [scroller_ setBounces:YES]; - [scroller_ setScrollingEnabled:YES]; - [scroller_ setShowBackgroundShadow:NO]; + [scroller_ setFixedBackgroundPattern:YES]; + [scroller_ setBackgroundColor:self.pageColor]; + [scroller_ setClipsSubviews:YES]; - [self setViewportWidth:width]; + [scroller_ setBounces:YES]; + [scroller_ setScrollingEnabled:YES]; + [scroller_ setShowBackgroundShadow:NO]; - reloaditem_ = [[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("RELOAD") - style:[self rightButtonStyle] - target:self - action:@selector(reloadButtonClicked) - ] autorelease]; + [self setViewportWidth:width_]; - loadingitem_ = [[[UIBarButtonItem alloc] - initWithTitle:@" " - style:UIBarButtonItemStylePlain - target:self - action:@selector(reloadButtonClicked) - ] autorelease]; + 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)]; + } - indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease]; - [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - UITableView *table([[[UITableView alloc] initWithFrame:bounds style:UITableViewStyleGrouped] autorelease]); - [webview_ insertSubview:table atIndex:0]; + ready_ = false; +} - [self applyLeftButton]; - [self applyRightButton]; +- (void) releaseSubviews { + webview_ = nil; + scroller_ = nil; - [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - } return self; + [self releaseNetworkActivityIndicator]; + + [super releaseSubviews]; } - (id) initWithWidth:(float)width { @@ -859,19 +1168,44 @@ float CYScrollViewDecelerationRateNormal; } return self; } +- (id) initWithRequest:(NSURLRequest *)request { + if ((self = [self init]) != nil) { + [self setRequest:request]; + } return self; +} + ++ (void) _lockJavaScript:(WebPreferences *)preferences { + WebThreadLocked lock; + [preferences setJavaScriptCanOpenWindowsAutomatically:NO]; +} + - (void) callFunction:(WebScriptObject *)function { WebThreadLocked lock; - WebView *webview([[webview_ _documentView] webView]); - WebFrame *frame([webview mainFrame]); + WebView *webview([[[self webView] _documentView] webView]); + 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]); - JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL); + 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 { - [self reloadURLWithCache:YES]; + [self reloadURLWithCache:NO]; } - (void) _customButtonClicked { @@ -919,7 +1253,7 @@ float CYScrollViewDecelerationRateNormal; } - (void) dispatchEvent:(NSString *)event { - [webview_ dispatchEvent:event]; + [[self webView] dispatchEvent:event]; } - (bool) hidesNavigationBar { @@ -942,12 +1276,54 @@ float CYScrollViewDecelerationRateNormal; [self setHidesNavigationBar:[value boolValue]]; } +- (void) setScrollAlwaysBounceVertical:(bool)value { + if ([webview_ respondsToSelector:@selector(_scrollView)]) { + UIScrollView *scroller([webview_ _scrollView]); + [scroller setAlwaysBounceVertical:value]; + } else if ([webview_ respondsToSelector:@selector(_scroller)]) { + //UIScroller *scroller([webview_ _scroller]); + // XXX: I am sad here. + } else return; +} + +- (void) setScrollAlwaysBounceVerticalNumber:(NSNumber *)value { + [self setScrollAlwaysBounceVertical:[value boolValue]]; +} + +- (void) setScrollIndicatorStyle:(UIScrollViewIndicatorStyle)style { + if ([webview_ respondsToSelector:@selector(_scrollView)]) { + UIScrollView *scroller([webview_ _scrollView]); + [scroller setIndicatorStyle:style]; + } else if ([webview_ respondsToSelector:@selector(_scroller)]) { + UIScroller *scroller([webview_ _scroller]); + [scroller setScrollerIndicatorStyle:style]; + } else return; +} + +- (void) setScrollIndicatorStyleWithName:(NSString *)style { + UIScrollViewIndicatorStyle value; + + if (false); + else if ([style isEqualToString:@"default"]) + value = UIScrollViewIndicatorStyleDefault; + else if ([style isEqualToString:@"black"]) + value = UIScrollViewIndicatorStyleBlack; + else if ([style isEqualToString:@"white"]) + value = UIScrollViewIndicatorStyleWhite; + else return; + + [self setScrollIndicatorStyle:value]; +} + - (void) viewWillAppear:(BOOL)animated { visible_ = true; 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]; } @@ -972,4 +1348,42 @@ float CYScrollViewDecelerationRateNormal; [self dispatchEvent:@"CydiaViewDidDisappear"]; } +- (void) updateHeights:(NSTimer *)timer { + for (WebFrame *frame in (id) registered_) + [frame cydia$updateHeight]; +} + +- (void) registerFrame:(WebFrame *)frame { + [registered_ addObject:frame]; + + if (timer_ == nil) + timer_ = [NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(updateHeights:) userInfo:nil repeats:YES]; +} + @end + +MSClassHook(WAKWindow) + +static CGSize $WAKWindow$screenSize(WAKWindow *self, SEL _cmd) { + CGSize size([[UIScreen mainScreen] bounds].size); + /*if ([$WAKWindow respondsToSelector:@selector(hasLandscapeOrientation)]) + if ([$WAKWindow hasLandscapeOrientation]) + std::swap(size.width, size.height);*/ + return size; +} + +static struct WAKWindow$screenSize { WAKWindow$screenSize() { + if ($WAKWindow != NULL) + if (Method method = class_getInstanceMethod($WAKWindow, @selector(screenSize))) + method_setImplementation(method, (IMP) &$WAKWindow$screenSize); +} } WAKWindow$screenSize;; + +MSClassHook(NSUserDefaults) + +MSHook(id, NSUserDefaults$objectForKey$, NSUserDefaults *self, SEL _cmd, NSString *key) { + if ([key respondsToSelector:@selector(isEqualToString:)] && [key isEqualToString:@"WebKitLocalStorageDatabasePathPreferenceKey"]) + return [NSString stringWithFormat:@"%@/%@/%@", NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).firstObject, NSBundle.mainBundle.bundleIdentifier, @"LocalStorage"]; + return _NSUserDefaults$objectForKey$(self, _cmd, key); +} + +CYHook(NSUserDefaults, objectForKey$, objectForKey:)