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 f8537100df164167dc24447fb2aacee4d7eca506..7d91177f9fee707b11557902274f29f1da966393 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -45,11 +45,6 @@ static Class $MFMailComposeViewController;
 
 float CYScrollViewDecelerationRateNormal;
 
-@interface WebView (Apple)
-- (void) _setLayoutInterval:(float)interval;
-- (void) _setAllowsMessaging:(BOOL)allows;
-@end
-
 @interface WebFrame (Cydia)
 - (void) cydia$updateHeight;
 @end
@@ -423,6 +418,7 @@ float CYScrollViewDecelerationRateNormal;
     }
 
     [page setDelegate:delegate_];
+    [page setPageColor:color_];
 
     if (!pop) {
         [[self navigationItem] setTitle:title_];
@@ -578,16 +574,18 @@ float CYScrollViewDecelerationRateNormal;
                             float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
                             float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
 
-                            uic = [UIColor
-                                colorWithRed:(red / 255)
-                                green:(green / 255)
-                                blue:(blue / 255)
-                                alpha:alpha
-                            ];
+                            if (alpha == 1)
+                                uic = [UIColor
+                                    colorWithRed:(red / 255)
+                                    green:(green / 255)
+                                    blue:(blue / 255)
+                                    alpha:alpha
+                                ];
                         }
                     }
 
-                    [scroller_ setBackgroundColor:uic];
+                    [super setPageColor:uic];
+                    [scroller_ setBackgroundColor:color_];
                     break;
                 }
     }
@@ -633,6 +631,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]); {
+        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);
@@ -680,21 +721,15 @@ float CYScrollViewDecelerationRateNormal;
     } 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]);
+        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;
@@ -833,6 +868,8 @@ float CYScrollViewDecelerationRateNormal;
         width_ = width;
         class_ = _class;
 
+        [super setPageColor:nil];
+
         allowsNavigationAction_ = true;
 
         loading_ = [NSMutableSet setWithCapacity:5];
@@ -905,7 +942,7 @@ float CYScrollViewDecelerationRateNormal;
         [preferences _setLayoutInterval:0];
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];
-    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
 
     if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
         [preferences setOfflineWebApplicationCacheEnabled:YES];
@@ -949,8 +986,11 @@ float CYScrollViewDecelerationRateNormal;
         //[scroller setAllowsRubberBanding:YES];
     }
 
+    [webview_ setOpaque:NO];
+    [webview_ setBackgroundColor:nil];
+
     [scroller_ setFixedBackgroundPattern:YES];
-    [scroller_ setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
+    [scroller_ setBackgroundColor:color_];
     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];
@@ -959,6 +999,13 @@ float CYScrollViewDecelerationRateNormal;
 
     [self setViewportWidth:width_];
 
+    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)];
+    }
+
     [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
     ready_ = false;
@@ -993,16 +1040,34 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
++ (void) _lockJavaScript:(WebPreferences *)preferences {
+    WebThreadLocked lock;
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
+}
+
 - (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]);
+
     JSObjectRef object([function JSObject]);
     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 {