Fix Cydia's popup blocking (broken since iOS 4.2).

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index cfe01f7018e914b0ce0b3af5c47ebfeb257f5d0e..7d91177f9fee707b11557902274f29f1da966393 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -38,14 +38,15 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #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;
 
 // 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
 
 @implementation WebFrame (Cydia)
 @end
 
 @implementation WebFrame (Cydia)


@@ -54,11 +55,23 @@ float CYScrollViewDecelerationRateNormal;
     return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[[([self provisionalDataSource] ?: [self dataSource]) request] URL] absoluteString]];
 }
 
     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];
+}
+

 @end
 
 /* Indirect Delegate {{{ */
 @implementation IndirectDelegate
 
 @end
 
 /* Indirect Delegate {{{ */
 @implementation IndirectDelegate
 

+- (id) delegate {
+    return delegate_;
+}
+

 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }


@@ -122,6 +135,14 @@ float CYScrollViewDecelerationRateNormal;
 + (void) _initialize {
     [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
 
 + (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<JSValueRef (*)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(js, "JSObjectCallAsFunction"));
+

     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 
     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 


@@ -397,6 +418,7 @@ float CYScrollViewDecelerationRateNormal;
     }
 
     [page setDelegate:delegate_];
     }
 
     [page setDelegate:delegate_];

+    [page setPageColor:color_];

 
     if (!pop) {
         [[self navigationItem] setTitle:title_];
 
     if (!pop) {
         [[self navigationItem] setTitle:title_];


@@ -498,6 +520,9 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
 }
 
 - (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 {
 }
 
 - (void) webView:(WebView *)view didCommitLoadForFrame:(WebFrame *)frame {


@@ -549,9 +574,7 @@ float CYScrollViewDecelerationRateNormal;
                             float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
                             float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
 
                             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)
                                 uic = [UIColor
                                     colorWithRed:(red / 255)
                                     green:(green / 255)


@@ -561,7 +584,8 @@ float CYScrollViewDecelerationRateNormal;
                         }
                     }
 
                         }
                     }
 

-                    [scroller_ setBackgroundColor:(uic ?: [UIColor clearColor])];
+                    [super setPageColor:uic];
+                    [scroller_ setBackgroundColor:color_];

                     break;
                 }
     }
                     break;
                 }
     }


@@ -591,6 +615,9 @@ float CYScrollViewDecelerationRateNormal;
         style_ = nil;
         function_ = nil;
 
         style_ = nil;
         function_ = nil;
 

+        [registered_ removeAllObjects];
+        timer_ = nil;
+

         allowsNavigationAction_ = true;
 
         [self setHidesNavigationBar:NO];
         allowsNavigationAction_ = true;
 
         [self setHidesNavigationBar:NO];


@@ -604,6 +631,49 @@ float CYScrollViewDecelerationRateNormal;
     [self _didStartLoading];
 }
 
     [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]); {
+        UITextInputTraits *traits([username textInputTraits]);
+        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+        [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+        [traits setKeyboardType:UIKeyboardTypeASCIICapable];
+        [traits setReturnKeyType:UIReturnKeyNext];
+    }
+
+    UITextField *password([alert textFieldAtIndex:1]); {
+        UITextInputTraits *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);
 - (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);


@@ -651,21 +721,15 @@ float CYScrollViewDecelerationRateNormal;
     } else if ([context isEqualToString:@"challenge"]) {
         id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
 
     } else if ([context isEqualToString:@"challenge"]) {
         id<NSURLAuthenticationChallengeSender> 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]);
-
-                [sender useCredential:credential forAuthenticationChallenge:challenge_];
-            } break;
+        if (button == [alert cancelButtonIndex])
+            [sender cancelAuthenticationChallenge:challenge_];
+        else if (button == [alert firstOtherButtonIndex]) {
+            NSString *username([[alert textFieldAtIndex:0] text]);
+            NSString *password([[alert textFieldAtIndex:1] text]);

 
 

-            case 2:
-                [sender cancelAuthenticationChallenge:challenge_];
-            break;
+            NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);

 
 

-            _nodefault
+            [sender useCredential:credential forAuthenticationChallenge:challenge_];

         }
 
         challenge_ = nil;
         }
 
         challenge_ = nil;


@@ -804,9 +868,12 @@ float CYScrollViewDecelerationRateNormal;
         width_ = width;
         class_ = _class;
 
         width_ = width;
         class_ = _class;
 

+        [super setPageColor:nil];
+

         allowsNavigationAction_ = true;
 
         loading_ = [NSMutableSet setWithCapacity:5];
         allowsNavigationAction_ = true;
 
         loading_ = [NSMutableSet setWithCapacity:5];

+        registered_ = [NSMutableSet setWithCapacity:5];

         indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
 
         reloaditem_ = [[[UIBarButtonItem alloc]
         indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
 
         reloaditem_ = [[[UIBarButtonItem alloc]


@@ -817,14 +884,24 @@ float CYScrollViewDecelerationRateNormal;
         ] autorelease];
 
         loadingitem_ = [[[UIBarButtonItem alloc]
         ] autorelease];
 
         loadingitem_ = [[[UIBarButtonItem alloc]

-            initWithTitle:@" "
+            initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @"       " : @" ")

             style:UIBarButtonItemStylePlain
             target:self
             action:@selector(reloadButtonClicked)
         ] autorelease];
 
             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)];
+        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];
         [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 
         [self applyLeftButton];


@@ -855,11 +932,6 @@ float CYScrollViewDecelerationRateNormal;
     // XXX: I think this improves scrolling; the hardcoded-ness sucks
     [document setTileSize:CGSizeMake(320, 500)];
 
     // XXX: I think this improves scrolling; the hardcoded-ness sucks
     [document setTileSize:CGSizeMake(320, 500)];
 

-    [document setBackgroundColor:[UIColor clearColor]];
-
-    // XXX: this is terribly (too?) expensive
-    [document setDrawsBackground:NO];
-

     WebView *webview([document webView]);
     WebPreferences *preferences([webview preferences]);
 
     WebView *webview([document webView]);
     WebPreferences *preferences([webview preferences]);
 


@@ -870,7 +942,7 @@ float CYScrollViewDecelerationRateNormal;
         [preferences _setLayoutInterval:0];
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];
         [preferences _setLayoutInterval:0];
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];

-    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];

 
     if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
         [preferences setOfflineWebApplicationCacheEnabled:YES];
 
     if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
         [preferences setOfflineWebApplicationCacheEnabled:YES];


@@ -914,8 +986,11 @@ float CYScrollViewDecelerationRateNormal;
         //[scroller setAllowsRubberBanding:YES];
     }
 
         //[scroller setAllowsRubberBanding:YES];
     }
 

+    [webview_ setOpaque:NO];
+    [webview_ setBackgroundColor:nil];
+

     [scroller_ setFixedBackgroundPattern:YES];
     [scroller_ setFixedBackgroundPattern:YES];

-    [scroller_ setBackgroundColor:[UIColor clearColor]];
+    [scroller_ setBackgroundColor:color_];

     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];
     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];


@@ -924,11 +999,13 @@ float CYScrollViewDecelerationRateNormal;
 
     [self setViewportWidth:width_];
 
 
     [self setViewportWidth:width_];
 

-    UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
-    [table setScrollsToTop:NO];
-    [webview_ insertSubview:table atIndex:0];
+    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)];
+    }

 
 

-    [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];

     [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
     ready_ = false;
     [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
     ready_ = false;


@@ -963,15 +1040,34 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
     } return self;
 }
 

++ (void) _lockJavaScript:(WebPreferences *)preferences {
+    WebThreadLocked lock;
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
+}
+

 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 
     WebView *webview([[[self webView] _documentView] webView]);
 - (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]);
     JSGlobalContextRef context([frame globalContext]);

+

     JSObjectRef object([function JSObject]);
     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 {
 }
 
 - (void) reloadButtonClicked {


@@ -1118,4 +1214,16 @@ float CYScrollViewDecelerationRateNormal;
     [self dispatchEvent:@"CydiaViewDidDisappear"];
 }
 
     [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
 @end