Changeset 672

Timestamp:

01/19/10 15:57:59 (8 weeks ago)

Author:

henri

Message:

Fix for case when autoprovisioning not possible and user only know the TelHosting? URL

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• AccountEditController.h (modified) (2 diffs)
• AccountEditController.m (modified) (4 diffs)
• AlertRenameView.m (modified) (5 diffs)
• MyTelConnect.h (modified) (2 diffs)
• MyTelConnect.m (modified) (1 diff)

apps/iphone/my.tel/trunk/Classes/AccountEditController.h

@@ -9 +9 @@
 #import <UIKit/UIKit.h>
 #import "MyTelConnect.h"
-#import "DnsResolver.h"
+#import "TextFieldCell.h"
+#import "AlertRenameView.h"
 
-#import "TextFieldCell.h"
-
-@interface AccountEditController : UITableViewController <UITextFieldDelegate> {
+@interface AccountEditController : UITableViewController <UITextFieldDelegate, UIAlertViewDelegate> {
         TextFieldCell *cellAccountLabel;                // user-created label for the account (optional)
         TextFieldCell *cellDomainName;                  // name of a domain in the account (any domain in the account will do)
@@ -25 +24 @@
 - (void)didPressSave;
 - (void)didPressCancel;
-- (NSString *)apiUrlForDomain:(NSString *)aDomain withError:(NSError **)error;
 
 @property (nonatomic, retain) IBOutlet TextFieldCell *cellAccountLabel;

apps/iphone/my.tel/trunk/Classes/AccountEditController.m

@@ -168 +168 @@
                         break;          
                 case 2:
-                        return @"There should be no need to modify this section.";
+                        return @"Modify items in this section only if necessary.";
                         break;          
                 default:
@@ -210 +210 @@
                 case 2:
                         cell = cellApiRootUrl;
-                        cell.textLabel.text = @"API Root URL";
+                        cell.textLabel.text = @"TelHosting API URL";
                         cell.textField.placeholder = @"http://telhosting/g2/json";
                         break;
@@ -282 +282 @@
         if (!self.apiRootUrl || [self.apiRootUrl isEqualToString:@""]) {
                 NSError *loginError = nil;      
-                self.apiRootUrl = [self apiUrlForDomain:self.domainName withError:&loginError];
-        }
-
+                self.apiRootUrl = [[MyTelConnect sharedInstance] apiUrlForDomain:self.domainName withError:&loginError];
+                if (loginError != nil) {
+                        // Can't get autoprovision, ask for .tel provider URL
+                        NSString *alertTitle = [NSString stringWithFormat:@"Unknown TelHosting URL for %@", self.domainName];
+                        NSMutableString *fullMessage = [NSMutableString stringWithString:@"Enter the TelHosting URL given by your .tel provider"];
+                        AlertRenameView *alert = [[AlertRenameView alloc] initWithTitle:alertTitle
+                                                                                                                                        message:fullMessage
+                                                                                                                                   delegate:self
+                                                                                                                  cancelButtonTitle:@"Cancel"
+                                                                                                                  otherButtonTitles:@"OK", nil];
+                        alert.uiStringField.minimumFontSize = 14.0f;
+                        alert.uiStringField.font = [alert.uiStringField.font fontWithSize:14.0f];
+                        alert.uiStringField.placeholder = @"https://telhosting.provider.com";
+                        [alert show];
+                        [alert release];
+                        self.navigationItem.rightBarButtonItem = origButton;
+                        [origButton release];
+                        return;
+                }                       
+        }
+        // All was well
         [self.delegate dataDidChangeInController:self];
-        self.navigationItem.rightBarButtonItem = origButton;
-        [origButton release];
         [self.navigationController popViewControllerAnimated:YES];
 }
@@ -295 +311 @@
 }
 
-- (NSString *)apiUrlForDomain:(NSString *)aDomain withError:(NSError **)error {
-        if (!aDomain)
-                return nil;
-        // try to autoprovision apiRootUrl
-        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-        NSMutableArray *naptrArray = [NSMutableArray arrayWithCapacity:1];
-        NSString *autoProvisionDomain = [@"_https._nsp._apps." stringByAppendingString:aDomain];
-        DnsResolver *resolver =[[DnsResolver alloc] init];
-        [resolver getNAPTRForTel:autoProvisionDomain inArray:naptrArray withError:error];
-        if ([naptrArray count] == 0) {
-                // couldn't find anything, try in http mode
-                NSString *autoProvisionDomainHttp = [@"_http._nsp._apps." stringByAppendingString:aDomain];
-                [resolver getNAPTRForTel:autoProvisionDomainHttp inArray:naptrArray withError:error];
-        }
-        [resolver release];
-        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-        if ([naptrArray count] > 0) {
-                // we have autoprovision of the Telhosting URL, let's tweak it to get the JSON API
-                RecordNaptr *theRec = [naptrArray objectAtIndex:0];
-                return ([theRec.uriContent stringByAppendingString:@"/g2/json"]);
-        }       
-        // Still found nothing, no autoprovisioning possible
-        return @"";
+#pragma mark -
+#pragma mark UIAlertViewDelegate methods
+
+- (void)alertView:(UIAlertView *)alertView willDismissWithButtonIndex:(NSInteger)buttonIndex {
+        if (buttonIndex == alertView.cancelButtonIndex) {
+                return;
+        }
+        NSMutableString *apiRoot = [NSMutableString stringWithString:((AlertRenameView *)alertView).uiStringField.text];
+        if (apiRoot == nil) {
+                [apiRoot setString:@""];
+        }
+        if (![apiRoot hasPrefix:@"http"]) {
+                [apiRoot insertString:@"https://" atIndex:0];
+        }
+        if (![apiRoot hasSuffix:@"/g2/json"]) {
+                [apiRoot appendString:@"/g2/json"];
+        }
+        self.apiRootUrl = ((AlertRenameView *)alertView).uiStringField.text = apiRoot;
 }
 

apps/iphone/my.tel/trunk/Classes/AlertRenameView.m

@@ -13 +13 @@
 #define kARTextFieldDiff 50
 // Height of text field
-#define kARTextFieldHeight 32
+#define kARTextFieldHeight 28
+// Height of bottom buttons of UIAlertView, including margins
+#define kARButtonsHeight 75
 
 @implementation AlertRenameView
@@ -32 +34 @@
                 theField.borderStyle = UITextBorderStyleRoundedRect;
                 theField.minimumFontSize = 16;
+                theField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
                 theField.clearButtonMode = UITextFieldViewModeAlways;
                 theField.autocorrectionType = UITextAutocorrectionTypeNo;
@@ -38 +41 @@
                 uiStringField = theField;
                 [self addSubview:uiStringField];
-                
-                self.message = @"\n\n";         // No messages here, only space for the entry field
     }
     return self;
+}
+
+- (void)setMessage:(NSString *)aMessage {
+        // add space for the entry field. Height depends on whether there's text or not
+        if ((aMessage != nil) && (aMessage != @"\n\n") && ([aMessage length] > 0)) {
+                [super setMessage:[aMessage stringByAppendingString:@"\n\n\n"]];
+        } else {
+                [super setMessage:@"\n\n"];
+        }
 }
 
@@ -49 +59 @@
     CGRect textRect = boundsRect;
         textRect.size = CGSizeMake(rect.size.width - kARTextFieldDiff, kARTextFieldHeight);
-        textRect = CGRectOffset(textRect, kARTextFieldDiff/2 , kARTextFieldHeight+18);
+        textRect = CGRectOffset(textRect, kARTextFieldDiff/2 , rect.size.height - (kARTextFieldHeight + kARButtonsHeight));
         uiStringField.frame = textRect;
 }
@@ -66 +76 @@
 }
 - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
-        self.frame = CGRectOffset(self.frame, 0, -(48+kARTextFieldHeight));
+        self.frame = CGRectOffset(self.frame, 0, -(52+kARTextFieldHeight));
         return YES;
 }
 - (void)textFieldDidEndEditing:(UITextField *)textField {
-        self.frame = CGRectOffset(self.frame, 0, 48+kARTextFieldHeight);
+        self.frame = CGRectOffset(self.frame, 0, 52+kARTextFieldHeight);
 }
 @end

apps/iphone/my.tel/trunk/Classes/MyTelConnect.h

@@ -11 +11 @@
 #import "JSON/JSON.h"
 #import "Profile.h"
+#import "DnsResolver.h"
+
+enum MyTelConnect_enum_status {
+        MYTELCONNECT_STATUS_NXAPIURL
+};
 
 // Shorthand for getting localized strings
@@ -44 +49 @@
 
 - (NSString *)topDomainFromDomain:(NSString *)aDomain;
+- (NSString *)apiUrlForDomain:(NSString *)aDomain withError:(NSError **)error;
 
 @property (nonatomic, retain) NSArray *profilesInDomain;

apps/iphone/my.tel/trunk/Classes/MyTelConnect.m

@@ -103 +103 @@
 }
 
+- (NSString *)apiUrlForDomain:(NSString *)aDomain withError:(NSError **)error {
+        if (!aDomain)
+                return nil;
+        // try to autoprovision apiRootUrl
+        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+        NSMutableArray *naptrArray = [NSMutableArray arrayWithCapacity:1];
+        NSString *autoProvisionDomain = [@"_https._nsp._apps." stringByAppendingString:aDomain];
+        DnsResolver *resolver =[[DnsResolver alloc] init];
+        [resolver getNAPTRForTel:autoProvisionDomain inArray:naptrArray withError:error];
+        if ([naptrArray count] == 0) {
+                // couldn't find anything, try in http mode
+                NSString *autoProvisionDomainHttp = [@"_http._nsp._apps." stringByAppendingString:aDomain];
+                [resolver getNAPTRForTel:autoProvisionDomainHttp inArray:naptrArray withError:error];
+        }
+        [resolver release];
+        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+        if ([naptrArray count] > 0) {
+                // we have autoprovision of the Telhosting URL, let's tweak it to get the JSON API
+                RecordNaptr *theRec = [naptrArray objectAtIndex:0];
+                return ([theRec.uriContent stringByAppendingString:@"/g2/json"]);
+        }       
+        // Still found nothing, no autoprovisioning possible
+        NSDictionary *dict = [NSDictionary dictionaryWithObject:@"Please verify that your domain name is correct"
+                                                                                                         forKey:NSLocalizedDescriptionKey];
+
+        if (error != NULL)
+                *error = [NSError errorWithDomain:@"my.tel" code:MYTELCONNECT_STATUS_NXAPIURL userInfo:dict];
+        return @"";
+}
+
 #pragma mark -
 #pragma mark singleton object methods