Replaced UIActionSheet with UIAlertView in BrowserView; not fully tested, but the...

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 69fd35cfcbde8ed44f90ac1c70f20b6a3bef06ff..ec779c94ab6ee8c9cf6aab42d1dd5daf1f1e06ee 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -83,8 +83,6 @@
 
 + (void) _initialize;
 
 
 + (void) _initialize;
 

-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button;
-

 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
 

diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index 7c123f9796cd49851c166b7ba29b1bc3f6ca8e06..5fa21e169094275ad80ee2a04a9ccfe85c5d9dfa 100644 (file)
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -315,18 +315,15 @@ static Class $UIWebBrowserView;
     if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
         [self loadRequest:request_];
     else {
     if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
         [self loadRequest:request_];
     else {

-        UIActionSheet *sheet = [[[UIActionSheet alloc]
+        UIAlertView *alert = [[[UIAlertView alloc]

             initWithTitle:UCLocalize("RESUBMIT_FORM")
             initWithTitle:UCLocalize("RESUBMIT_FORM")

-            buttons:[NSArray arrayWithObjects:UCLocalize("CANCEL"), UCLocalize("SUBMIT"), nil]
-            defaultButtonIndex:0
+            message:nil

             delegate:self
             delegate:self

-            context:@"submit"
+            cancelButtonTitle:UCLocalize("CANCEL")
+            otherButtonTitles:UCLocalize("SUBMIT"), nil

         ] autorelease];
         ] autorelease];

-
-        [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
-
-        [sheet setNumberOfRows:1];
-        [sheet popupAlertAnimated:YES];
+        [alert setContext:@"submit"];
+        [alert show];

     }
 }
 
     }
 }
 


@@ -448,21 +445,19 @@ static Class $UIWebBrowserView;
 - (void) _promptForSensitive:(NSMutableArray *)array {
     NSString *name([array objectAtIndex:0]);
 
 - (void) _promptForSensitive:(NSMutableArray *)array {
     NSString *name([array objectAtIndex:0]);
 

-    UIActionSheet *sheet = [[[UIActionSheet alloc]
+    UIAlertView *alert = [[[UIAlertView alloc]

         initWithTitle:nil
         initWithTitle:nil

-        buttons:[NSArray arrayWithObjects:UCLocalize("YES"), UCLocalize("NO"), nil]
-        defaultButtonIndex:0
+        message:nil

         delegate:indirect_
         delegate:indirect_

-        context:@"sensitive"
+        cancelButtonTitle:UCLocalize("NO")
+        otherButtonTitles:UCLocalize("YES"), nil

     ] autorelease];
 
     ] autorelease];
 

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

     NSString *host(@"XXX");
 
     NSString *host(@"XXX");
 

-    [sheet setNumberOfRows:1];
-    [sheet setBodyText:[NSString stringWithFormat:@"The website at %@ is requesting your phone's %@. This is almost certainly for product licensing purposes. Will you allow this?", host, name]];
-    [sheet popupAlertAnimated:YES];
+    [alert setContext:@"sensitive"];
+    [alert setMessage:[NSString stringWithFormat:@"The website at %@ is requesting your phone's %@. This is almost certainly for product licensing purposes. Will you allow this?", host, name]];
+    [alert show];

 
     NSRunLoop *loop([NSRunLoop currentRunLoop]);
     NSDate *future([NSDate distantFuture]);
 
     NSRunLoop *loop([NSRunLoop currentRunLoop]);
     NSDate *future([NSDate distantFuture]);


@@ -492,18 +487,15 @@ static Class $UIWebBrowserView;
         return;
     [self retain];
 
         return;
     [self retain];
 

-    UIActionSheet *sheet = [[[UIActionSheet alloc]
+    UIAlertView *alert = [[[UIAlertView alloc]

         initWithTitle:nil
         initWithTitle:nil

-        buttons:[NSArray arrayWithObjects:UCLocalize("OK"), nil]
-        defaultButtonIndex:0
+        message:message

         delegate:self
         delegate:self

-        context:@"alert"
+        cancelButtonTitle:UCLocalize("OK")
+        otherButtonTitles:nil

     ] autorelease];
     ] autorelease];

-
-    [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
-
-    [sheet setBodyText:message];
-    [sheet popupAlertAnimated:YES];
+    [alert setContext:@"alert"];
+    [alert show];

 }
 
 - (BOOL) webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
 }
 
 - (BOOL) webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {


@@ -511,19 +503,16 @@ static Class $UIWebBrowserView;
         return NO;
     [self retain];
 
         return NO;
     [self retain];
 

-    UIActionSheet *sheet = [[[UIActionSheet alloc]
+    UIAlertView *alert = [[[UIAlertView alloc]

         initWithTitle:nil
         initWithTitle:nil

-        buttons:[NSArray arrayWithObjects:UCLocalize("OK"), UCLocalize("CANCEL"), nil]
-        defaultButtonIndex:0
+        message:message

         delegate:indirect_
         delegate:indirect_

-        context:@"confirm"
+        cancelButtonTitle:UCLocalize("CANCEL")
+        otherButtonTitles:UCLocalize("OK"), nil

     ] autorelease];
 
     ] autorelease];
 

-    [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
-
-    [sheet setNumberOfRows:1];
-    [sheet setBodyText:message];
-    [sheet popupAlertAnimated:YES];
+    [alert setContext:@"confirm"];
+    [alert show];

 
     NSRunLoop *loop([NSRunLoop currentRunLoop]);
     NSDate *future([NSDate distantFuture]);
 
     NSRunLoop *loop([NSRunLoop currentRunLoop]);
     NSDate *future([NSDate distantFuture]);


@@ -784,12 +773,12 @@ static Class $UIWebBrowserView;
     //lprintf("Status:%s\n", [text UTF8String]);
 }
 
     //lprintf("Status:%s\n", [text UTF8String]);
 }
 

-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
-    NSString *context([sheet context]);
+- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
+    NSString *context([alert context]);

 
     if ([context isEqualToString:@"alert"]) {
         [self autorelease];
 
     if ([context isEqualToString:@"alert"]) {
         [self autorelease];

-        [sheet dismiss];
+        [alert dismissWithClickedButtonIndex:-1 animated:YES];

     } else if ([context isEqualToString:@"confirm"]) {
         switch (button) {
             case 1:
     } else if ([context isEqualToString:@"confirm"]) {
         switch (button) {
             case 1:


@@ -801,7 +790,7 @@ static Class $UIWebBrowserView;
             break;
         }
 
             break;
         }
 

-        [sheet dismiss];
+        [alert dismissWithClickedButtonIndex:-1 animated:YES];

     } else if ([context isEqualToString:@"sensitive"]) {
         switch (button) {
             case 1:
     } else if ([context isEqualToString:@"sensitive"]) {
         switch (button) {
             case 1:


@@ -813,14 +802,14 @@ static Class $UIWebBrowserView;
             break;
         }
 
             break;
         }
 

-        [sheet dismiss];
+        [alert dismissWithClickedButtonIndex:-1 animated:YES];

     } else if ([context isEqualToString:@"challenge"]) {
         id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
 
         switch (button) {
             case 1: {
     } else if ([context isEqualToString:@"challenge"]) {
         id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
 
         switch (button) {
             case 1: {

-                NSString *username([[sheet textFieldAtIndex:0] text]);
-                NSString *password([[sheet textFieldAtIndex:1] text]);
+                NSString *username([[alert textFieldAtIndex:0] text]);
+                NSString *password([[alert textFieldAtIndex:1] text]);

 
                 NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
 
 
                 NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
 


@@ -837,7 +826,7 @@ static Class $UIWebBrowserView;
         [challenge_ release];
         challenge_ = nil;
 
         [challenge_ release];
         challenge_ = nil;
 

-        [sheet dismiss];
+        [alert dismissWithClickedButtonIndex:-1 animated:YES];

     } else if ([context isEqualToString:@"submit"]) {
         switch (button) {
             case 1:
     } else if ([context isEqualToString:@"submit"]) {
         switch (button) {
             case 1:


@@ -854,7 +843,7 @@ static Class $UIWebBrowserView;
             _nodefault
         }
 
             _nodefault
         }
 

-        [sheet dismiss];
+        [alert dismissWithClickedButtonIndex:-1 animated:YES];

     }
 }
 
     }
 }
 


@@ -866,22 +855,21 @@ static Class $UIWebBrowserView;
     if (realm == nil)
         realm = @"";
 
     if (realm == nil)
         realm = @"";
 

-    UIActionSheet *sheet = [[[UIActionSheet alloc]
+    UIAlertView *alert = [[[UIAlertView alloc]

         initWithTitle:realm
         initWithTitle:realm

-        buttons:[NSArray arrayWithObjects:UCLocalize("LOGIN"), UCLocalize("CANCEL"), nil]
-        defaultButtonIndex:0
+        message:nil

         delegate:self
         delegate:self

-        context:@"challenge"
+        cancelButtonTitle:UCLocalize("CANCEL")
+        otherButtonTitles:UCLocalize("LOGIN"), nil

     ] autorelease];
 
     ] autorelease];
 

-    [sheet setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
-
-    [sheet setNumberOfRows:1];
+    [alert setContext:@"challenge"];
+    [alert setNumberOfRows:1];

 
 

-    [sheet addTextFieldWithValue:@"" label:UCLocalize("USERNAME")];
-    [sheet addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
+    [alert addTextFieldWithValue:@"" label:UCLocalize("USERNAME")];
+    [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];

 
 

-    UITextField *username([sheet textFieldAtIndex:0]); {
+    UITextField *username([alert textFieldAtIndex:0]); {

         UITextInputTraits *traits([username textInputTraits]);
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         UITextInputTraits *traits([username textInputTraits]);
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];


@@ -889,7 +877,7 @@ static Class $UIWebBrowserView;
         [traits setReturnKeyType:UIReturnKeyNext];
     }
 
         [traits setReturnKeyType:UIReturnKeyNext];
     }
 

-    UITextField *password([sheet textFieldAtIndex:1]); {
+    UITextField *password([alert textFieldAtIndex:1]); {

         UITextInputTraits *traits([password textInputTraits]);
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         UITextInputTraits *traits([password textInputTraits]);
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];


@@ -899,7 +887,7 @@ static Class $UIWebBrowserView;
         [traits setSecureTextEntry:YES];
     }
 
         [traits setSecureTextEntry:YES];
     }
 

-    [sheet popupAlertAnimated:YES];
+    [alert show];

 }
 
 - (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source {
 }
 
 - (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source {