From 8d69560475cae3c03761e7799429b6cc3f8a34a8 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 16 Jan 2015 17:58:42 +0100
Subject: [PATCH] Prevent the wizard from freezing when an invalid
 username/domain is entered in External account

---
 Classes/Base.lproj/WizardViews.xib     |   4 +-
 Classes/WizardViewController.h         |   2 +-
 Classes/WizardViewController.m         |  49 +++++++++++++++++++------
 Resources/en.lproj/Localizable.strings |   4 +-
 Resources/fr.lproj/Localizable.strings | Bin 27962 -> 28014 bytes
 Resources/ru.lproj/Localizable.strings | Bin 27436 -> 27460 bytes
 ar.lproj/Localizable.strings           | Bin 26846 -> 26882 bytes
 7 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/Classes/Base.lproj/WizardViews.xib b/Classes/Base.lproj/WizardViews.xib
index c37a761cc..a493a34eb 100644
--- a/Classes/Base.lproj/WizardViews.xib
+++ b/Classes/Base.lproj/WizardViews.xib
@@ -111,11 +111,11 @@
                         <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
                     </state>
                     <connections>
-                        <action selector="onConnectAccountClick:" destination="-1" eventType="touchUpInside" id="41"/>
+                        <action selector="onConnectLinphoneAccountClick:" destination="-1" eventType="touchUpInside" id="JTf-u3-Kbe"/>
                     </connections>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="39" userLabel="externalAccountButton" customClass="UILinphoneButton">
-                    <rect key="frame" x="33" y="269" width="255" height="50"/>
+                    <rect key="frame" x="33" y="387" width="255" height="72"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Sign in SIP account">
                         <bool key="isElement" value="YES"/>
diff --git a/Classes/WizardViewController.h b/Classes/WizardViewController.h
index 8ec3e7f3d..2b89363b6 100644
--- a/Classes/WizardViewController.h
+++ b/Classes/WizardViewController.h
@@ -71,7 +71,7 @@
 - (IBAction)onCancelClick:(id)sender;
 
 - (IBAction)onCreateAccountClick:(id)sender;
-- (IBAction)onConnectAccountClick:(id)sender;
+- (IBAction)onConnectLinphoneAccountClick:(id)sender;
 - (IBAction)onExternalAccountClick:(id)sender;
 - (IBAction)onCheckValidationClick:(id)sender;
 - (IBAction)onRemoteProvisioningClick:(id)sender;
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index a1efda5b4..82cc40592 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -425,7 +425,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 }
 
-- (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain withTransport:(NSString*)transport {
+- (BOOL)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain withTransport:(NSString*)transport {
     LinphoneCore* lc = [LinphoneManager getLc];
 	LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config(lc);
 	NSString* server_address = domain;
@@ -448,11 +448,29 @@ static UICompositeViewDescription *compositeDescription = nil;
         linphone_address_set_domain(linphoneAddress, [domain UTF8String]);
     }
 
-    identity = linphone_address_as_string_uri_only(linphoneAddress);
+    char* extractedAddres = linphone_address_as_string_uri_only(linphoneAddress);
 
-    linphone_proxy_config_set_identity(proxyCfg, identity);
+	LinphoneAddress* parsedAddress = linphone_address_new(extractedAddres);
+	ms_free(extractedAddres);
 
+	if( parsedAddress == NULL || !linphone_address_is_sip(parsedAddress) ){
+		if( parsedAddress ) linphone_address_destroy(parsedAddress);
+		UIAlertView* errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check error(s)",nil)
+															message:NSLocalizedString(@"Please enter a valid username", nil)
+														   delegate:nil
+												  cancelButtonTitle:NSLocalizedString(@"Continue",nil)
+												  otherButtonTitles:nil,nil];
+		[errorView show];
+		[errorView release];
+		return FALSE;
+	}
 
+	char *c_parsedAddress = linphone_address_as_string_uri_only(parsedAddress);
+
+	linphone_proxy_config_set_identity(proxyCfg, c_parsedAddress);
+
+	linphone_address_destroy(parsedAddress);
+	ms_free(c_parsedAddress);
 
     LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String]
 													, NULL, [password UTF8String]
@@ -467,7 +485,8 @@ static UICompositeViewDescription *compositeDescription = nil;
     linphone_proxy_config_enable_register(proxyCfg, true);
 	linphone_core_add_auth_info(lc, info);
     linphone_core_add_proxy_config(lc, proxyCfg);
-	linphone_core_set_default_proxy(lc, proxyCfg);
+	linphone_core_set_default_proxy_config(lc, proxyCfg);
+	return TRUE;
 }
 
 - (void)addProvisionedProxy:(NSString*)username withPassword:(NSString*)password withDomain:(NSString*)domain {
@@ -509,6 +528,8 @@ static UICompositeViewDescription *compositeDescription = nil;
     return [uri substringFromIndex:[scheme length] + 1];
 }
 
+#pragma mark - Linphone XMLRPC
+
 - (void)checkUserExist:(NSString*)username {
     [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC check_account %@", username];
     
@@ -552,6 +573,8 @@ static UICompositeViewDescription *compositeDescription = nil;
     [waitView setHidden:false];
 }
 
+#pragma mark -
+
 - (void)registrationUpdate:(LinphoneRegistrationState)state message:(NSString*)message{
     switch (state) {
         case LinphoneRegistrationOk: {
@@ -668,7 +691,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     [self loadWizardConfig:@"wizard_linphone_create.rc"];
 }
 
-- (IBAction)onConnectAccountClick:(id)sender {
+- (IBAction)onConnectLinphoneAccountClick:(id)sender {
     nextView = connectAccountView;
     [self loadWizardConfig:@"wizard_linphone_existing.rc"];
 }
@@ -704,11 +727,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void) verificationSignInWithUsername:(NSString*)username password:(NSString*)password domain:(NSString*)domain withTransport:(NSString*)transport {
 	NSMutableString *errors = [NSMutableString string];
 	if ([username length] == 0) {
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a username.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.\n", nil)]];
 	}
 
 	if (domain != nil && [domain length] == 0) {
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a domain.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid domain.\n", nil)]];
 	}
 
 	if([errors length]) {
@@ -720,9 +743,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 		[errorView show];
 		[errorView release];
 	} else {
-		[self.waitView setHidden:false];
+		[waitView setHidden:false];
 		if ([LinphoneManager instance].connectivity == none) {
-			DTAlertView *alert = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"No connectivity", nil) message:NSLocalizedString(@"You can either skip verification or connect to the Internet first.", nil)];
+			DTAlertView *alert = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"No connectivity", nil)
+															message:NSLocalizedString(@"You can either skip verification or connect to the Internet first.", nil)];
 			[alert addCancelButtonWithTitle:NSLocalizedString(@"Stay here", nil) block:^{
 				[waitView setHidden:true];
 			}];
@@ -733,7 +757,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 			}];
 			[alert show];
 		} else {
-			[self addProxyConfig:username password:password domain:domain withTransport:transport];
+			BOOL success = [self addProxyConfig:username password:password domain:domain withTransport:transport];
+			if( !success ){
+				waitView.hidden = true;
+			}
 		}
 	}
 }
@@ -807,7 +834,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     NSMutableString *errors = [NSMutableString string];
     if ([username length] == 0) {
 
-        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a username.\n", nil)]];
+        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.\n", nil)]];
     }
 
     if([errors length]) {
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index bcda4113c..22f46c686 100644
--- a/Resources/en.lproj/Localizable.strings
+++ b/Resources/en.lproj/Localizable.strings
@@ -281,10 +281,10 @@
 "Photo library" = "Photo library";
 
 /* No comment provided by engineer. */
-"Please enter a domain.\n" = "Please enter a domain.\n";
+"Please enter a valid domain.\n" = "Please enter a valid domain.\n";
 
 /* No comment provided by engineer. */
-"Please enter a username.\n" = "Please enter a username.\n";
+"Please enter a valid username.\n" = "Please enter a valid username.\n";
 
 /* No comment provided by engineer. */
 "Please make sure your device is connected to the internet and double check your SIP account configuration in the settings." = "Please make sure your device is connected to the internet and double check your SIP account configuration in the settings.";
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 421459a437b00fac1519447c85cb2856d51f6740..b38bdeda6004bac13ceefd2ee4a11ecd5baa892e 100644
GIT binary patch
delta 90
zcmdmWi}Bqp#tpliIm;Ll8FCmh8B!*1clH-nV1V-(QW^9ZVi@u!HbzdK<19DXz*uJT
QBo{Z_O87RrxPDUy004~}K>z>%

delta 30
lcmaENi*eU2#tpliCm(b6nXKSaGkJwe7?94{T;cjn9RTWa4lDow

diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index 93b547715ba0fc0bc7d0811833aae4cf1b9b9631..ed548e5fd1a2f04ac9ed33dea49ab3added8d0ac 100644
GIT binary patch
delta 32
ocmZ2;jq%7e#tlE5ILjCk8FCmh8B!*Hbvipa!$@ZHCFdx00OWNIO8@`>

delta 22
ecmX?djd9I2#tlE5CbKx7np|Qeu=$m9lsW)`RSH)C

diff --git a/ar.lproj/Localizable.strings b/ar.lproj/Localizable.strings
index 7beecb2027669682c74a09cf06ac36c9cddba6e2..80cc716677e8e89d51bb70656b72526e1f78af11 100644
GIT binary patch
delta 48
zcmcb2k+JC#<Ay&DoMjA&3^@#$3@MX;Ivkz6!$4;8IY&Jx%`w@_F=cawQ<@q8^e_{@

delta 38
scmZp=#CY!_<Ay&DlbswzCd)Xkn|#DTV6uS|$K-d8Y9RJz1E))B07{q-`Tzg`