From a7b29b26fdfbfe1e01b8fb23b564e82fcecf1192 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 19 Oct 2015 12:09:16 +0200
Subject: [PATCH 1/4] submodules: update belle-sip and linphone to fix crash in
 contacts parsing when containing unicode characters

---
 submodules/belle-sip | 2 +-
 submodules/linphone  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/belle-sip b/submodules/belle-sip
index 1ced63785..611b6c3b1 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 1ced637855bb052f2475847c867f648338b84376
+Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783
diff --git a/submodules/linphone b/submodules/linphone
index 00e96f59f..dae216855 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 00e96f59f7af7fd7a47421ea0f118036182f8ea6
+Subproject commit dae216855ca67430cc25135f4eef52f1e5edc1c2

From 711741648a8cf1c760ae5103b478217e9d1cf3f8 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 19 Oct 2015 12:19:42 +0200
Subject: [PATCH 2/4] i18n: update translations

---
 Classes/WizardViewController.m                |  33 ++++++++++--------
 Resources/ar.lproj/Localizable.strings        | Bin 32936 -> 32626 bytes
 Resources/de.lproj/Localizable.strings        | Bin 35326 -> 35302 bytes
 Resources/en.lproj/Localizable.strings        | Bin 33748 -> 33068 bytes
 Resources/fr.lproj/Localizable.strings        | Bin 35112 -> 35088 bytes
 Resources/ja.lproj/Localizable.strings        | Bin 29718 -> 29694 bytes
 Resources/nl.lproj/Localizable.strings        | Bin 35016 -> 34992 bytes
 Resources/ru.lproj/Localizable.strings        | Bin 34176 -> 34144 bytes
 Resources/zh_TW.lproj/Localizable.strings     | Bin 33656 -> 33608 bytes
 .../en.lproj/Root.strings                     |   1 +
 10 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index fc6a5efed..e02ca09b8 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -411,7 +411,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 			linphone_address_destroy(parsedAddress);
 		UIAlertView *errorView =
 			[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check error(s)", nil)
-									   message:NSLocalizedString(@"Please enter a valid username", nil)
+									   message:NSLocalizedString(@"Please enter a valid username.", nil)
 									  delegate:nil
 							 cancelButtonTitle:NSLocalizedString(@"Continue", nil)
 							 otherButtonTitles:nil, nil];
@@ -701,11 +701,13 @@ static UICompositeViewDescription *compositeDescription = nil;
 				   withTransport:(NSString *)transport {
 	NSMutableString *errors = [NSMutableString string];
 	if ([username length] == 0) {
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.", nil)]];
+		[errors appendString:@"\n"];
 	}
 
 	if (domain != nil && [domain length] == 0) {
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid domain.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid domain.", nil)]];
+		[errors appendString:@"\n"];
 	}
 
 	if ([errors length]) {
@@ -779,26 +781,28 @@ static UICompositeViewDescription *compositeDescription = nil;
 	NSInteger password_length = [[LinphoneManager instance] lpConfigIntForKey:@"password_length" forSection:@"wizard"];
 
 	if ([username length] < username_length) {
-		[errors
-			appendString:[NSString stringWithFormat:NSLocalizedString(
-														@"The username is too short (minimum %d characters).\n", nil),
-													username_length]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(
+															@"The username is too short (minimum %d characters).", nil),
+														username_length]];
+		[errors appendString:@"\n"];
 	}
 
 	if ([password length] < password_length) {
-		[errors
-			appendString:[NSString stringWithFormat:NSLocalizedString(
-														@"The password is too short (minimum %d characters).\n", nil),
-													password_length]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(
+															@"The password is too short (minimum %d characters).", nil),
+														password_length]];
+		[errors appendString:@"\n"];
 	}
 
 	if (![password2 isEqualToString:password]) {
-		[errors appendString:NSLocalizedString(@"The passwords are different.\n", nil)];
+		[errors appendString:NSLocalizedString(@"The passwords are different.", nil)];
+		[errors appendString:@"\n"];
 	}
 
 	NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", @".+@.+\\.[A-Za-z]{2}[A-Za-z]*"];
 	if (![emailTest evaluateWithObject:email]) {
-		[errors appendString:NSLocalizedString(@"The email is invalid.\n", nil)];
+		[errors appendString:NSLocalizedString(@"The email is invalid.", nil)];
+		[errors appendString:@"\n"];
 	}
 
 	if ([errors length]) {
@@ -837,7 +841,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 	NSMutableString *errors = [NSMutableString string];
 	if ([username length] == 0) {
 
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.", nil)]];
+		[errors appendString:@"\n"];
 	}
 
 	if ([errors length]) {
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 66fea75f7b9b8a136fc0f483e723d3ace90215c7..921f348f97779bc9bfc840b70087726960622eee 100644
GIT binary patch
delta 1213
zcmcIj!EVz)5S>(Ia!3V-N~nMkZqi`a#0jaBA|iq6#2XjW0~{!a2Iv7QkPsjhZV1yG
zrwXw@!Kp&>oiE_PcW|tFtRmj5oi-S8<l>!O&%T-W-t5=CnZt4E+fL<@%^}<Dv&%7G
zL)2%B<Ya}FZqIL}zbZS67Xpr0A;qE=(g!?;sD@SP`wzC#A6{=kA4Ju(G5k<U527!e
z1l&QQMS|`Ey#aLDhg{=feqO9PG}XHXdL7>$?zFLX*+b+Z3V99RI<;wuc4-aKiiw&u
zqE{57#R1R<Y(1em-vnHXm*oQ1CU(-m0AFQJW$&8;HI{N&s~!Xp36yEm1@EgUE-3Qf
z!ws7q*5B{E)j#jf>Ftg4>FmAPaybUYHphDJ<7K_SIZEF@e0oOr{fl}$I!uoqaY>IK
zAM2UbrL?;J>0IIh>Uz$vM;7^LAwZEF29XeG844D)P1!IfBL=uAwvHCF)?DmYK}(eN
zfu`^`01ew%)-&pOrb+`OaGK<NT)qJ|F;Yc9NfE{|I1A$qdV$k7^qgK}eRcxlqO>h+
zp=zd!0v%CX2FT^ijz0E+=OH^rq(CS{tdIl#7KtTYQ^=uWa%NN3|EW<9@?-9qJK}W*
zaDmw^(lY%u1tc1asx>qr%|zHoSnULz{3%i&I>>y~!Am?2k!YJa7r8}PX=w@qI~i*u
zC(a#nM;XyGBn5<Q(&PzrpjC|aMTZWT1<d7vyfD50@@#s%d%KiabPEntjb{I8IHo$z
y=6&M78Hy&#7oC{4t?1fB8VBmiG)|sZ(YI4~P8=x6Ct_Xsms(R|rJvs|RDJ^`TCSA<

delta 185
zcmezLk8wpK(}pze$p+kdle3t^Hs9e+Q=BZKt2TKHQ`qKhx>gd*F${T|-@7hk1T*^G
zC$mj1@mHGs!zXKUgP+*s0^e02rITd>q$UUWaBQCD&%!Pq%#g~E$B@F12_(}Q6c}<C
z@_}^m<ie=v%@W~htRSN%8=8two)Ys7Y;0#NJJ|fm{c(T60^RXz`8Q9?nZ*P#Jcn=d
Tl0rAe&C?2f7&o(&<Z%N4pzlC5

diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index eed4a9dd379fe724a20410b15cff627538d42ad1..b5abfbd2e16712ebc4d4079efdc048db57eb5ba5 100644
GIT binary patch
delta 65
zcmex2nd#YNrVUPBlUE6FP5$T0Guh8aW^#gx(B>|$Rg9Cr_=;`z^LZdP*(Fn8vQzS}
U#SSTqAok{vR3^sFQE5w*0fh+~AOHXW

delta 67
zcmaDhnd#qTrVUPB%rOjkn;pI0GlCeC4ZX8B&+_RJ1B<FAbAv@U>!&b68L7e$hGW`N
FWdIFx6$k(T

diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index ad0a1f4a36a6688fce51a7199ddc1d29affb6ea3..4b27020b3dabc29c42549aea3c533252cfb904b4 100644
GIT binary patch
delta 124
zcmcc8&a|e9X@i*i<P<N7$#2}WCcF4VO`hOk1?JE3&;#=yxbbYR^W+fPtP#77aq^=$
zlgVw&5tBD0u}yvz9|z<MO@0#}Gr2_oBDN~Q2rRZH!2mAyEfJ#bM<Q6=<_$?IiU6Kt
BH5>o{

delta 444
zcmZ3}#B`;dX@i(Ma|}b?<XTV3$$IWuj4_i9b)qM4aJQQ5kij*%!;^3FK6jnTcQPV?
zVm5G<``q>5D)~0g@Zb=N&1cAENM%r9$YjW4C}T)u$N{oafc#{J3?Q!vh?5ygfGUa@
zih-i#Kv57Iq$7<XpP>|}3#1yPTLGvJB&)!X4&;{sS$UHuDo9R#lq6PP1l9vG38c1!
zL61QR$g%}uC5B+2IW%+w(2n5AQx!x(?%+jn$K=Mi*v<2zb})j&$1z@baz>02G<@#G
maZG*{69bn4vQcCNCa1+IAjyLHa1|*~nS8hi+h)E5IYj_y<##3k

diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 94f329f08a0e1923de226dad0aba29a59b427894..a103c4c9f332461dba19bfea7fde5753df7f6087 100644
GIT binary patch
delta 50
zcmZ26iD|+lrVU13ldt&7Ot$lp+g#wajuFJ!Z0B=FY_eSPm(5}+T#TDlQh|g~+BYQt
D1+o*J

delta 78
zcmbO*iD|_orVU13%rOjkn+?5QGJ+VB4ZW-<$9Zc^?(@pp{LDv33@j*^{1vQ<HH90j
TYBPT-gfV$;f%)cuv;#^22!a`v

diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 7f4aa07b872f7de4e77d296671ef2ed1990da010..901ca53868e4947d4425098f971550e9cb76f6c6 100644
GIT binary patch
delta 48
zcmbRCg7M#T#tnNMChy|o+I-5PjB)Y-hbfzHIAsV;b_snl`CpjSWVf&_K>F3@H{n_`
E08w2S8UO$Q

delta 64
zcmezOoN?L<#tnNMm}407Ht%+5WCSy;o&E}e7?aIIpMq)Wu=7w_dNND+1+b#a;o33)
DB{UZ&

diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings
index 7326dae19d81dc7ae9b3d6b76b3ec8394b46c2a0..ddbae2a991738a5845ce7332565ceafa67ca7c7a 100644
GIT binary patch
delta 54
zcmX>xk!b@EJ@A}-z)Nd0pVuTtAj4<#2X7Ct$y>CACi^9Q0MVO6l9?DcN2N$GZZ1m=
GQU(B$(H2Jl

delta 74
zcmdlmk?F)lrVS4~nPV98HsAN$%LrmjzVE3$S;10d^DXZ%F|dGPvhZZ5qz_<KhRLE}
PRhwN?Bq5C0)L>-*2M-x2

diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index 035caa73b386ce57055305b11c4a52b3fc7488df..7c6aeaeedec72fa69da58bc6eee0130ec892db8e 100644
GIT binary patch
delta 73
zcmZqZW_r-Yv|)wE<R)K<$#ouDlTDZ+CM$SZP4<%Fn%w7k4lJ(cr3V%-@Zj4l;N2v;
Yd0K)H<K#7o-!?BxVq)C9Ci#jY00b-?K>z>%

delta 99
zcmaFR#njNvv|)t@a|}b?<U(J`$p<{NCNrhPOfCS@8$5+3*Lhxp%LRDqOiGCZO7U&-
jZW09vZ*EKwW(3Q3C#z51m3RRx*qOu(7TnyOd{q$uB+nzc

diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
index edbc17b01453eb71999751b365829bdb0b805354..4c936fb0dfd6981c42fb22d4270f4cf08d9668a0 100644
GIT binary patch
delta 115
zcmey-#&n{MX~QnJ$weL}lh?TMO%4%=m>lQLH`&2MXEI+l*W?B6=YVo<lg&yX;tF0b
zHgkDZh)iyaGnu^2C}Oflg2dzn@jjF5;`6|oJrXQ{Y^BKw2?~=lDk3INNlcmCl?ayG
J9FnA>2mpAWEwKOq

delta 165
zcmX@n#`L3&X~Qlz<`{;&$-VBTli#`VF~&@OXd6A*&zo=Z1UH$<b?z^qvaZZ}3<x;^
zuNRwtc~*#kB@5$Bq1yh%rGP~e<MZJn5|bSg6riHYAU0fvW3r2p&}5NBFQ_TPlM51K
M;IeF+wUXo%0jgX+eE<Le

diff --git a/Settings/InAppSettings.bundle/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings
index b570484c6..0ad29dc36 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings
@@ -24,3 +24,4 @@
 "Release core" = "Release core";
 "Clear cache" = "Clear cache";
 "Battery alert" = "Battery alert";
+"Auto answer call immediately" = "Auto answer call immediately";

From b74353d976eb1aa26842a3ff66a3b5c6106e3b97 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 19 Oct 2015 14:51:08 +0200
Subject: [PATCH 3/4] UITester: fix test

---
 TestsUI/CallTester.m | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/TestsUI/CallTester.m b/TestsUI/CallTester.m
index b51398e24..bc2085602 100644
--- a/TestsUI/CallTester.m
+++ b/TestsUI/CallTester.m
@@ -53,9 +53,10 @@
 }
 
 - (void)testDialInvalidSIPURI {
-	[self callURI:@"123 😀"];
-	[tester waitForViewWithAccessibilityLabel:
-				@"Some invalid characters where found in the given SIP address. Please correct it."];
+	NSString *user = @"123 😀";
+	[self callURI:user];
+	[tester waitForViewWithAccessibilityLabel:[NSString
+												  stringWithFormat:@"Cannot call %@.\nReason was: Call failed", user]];
 	[tester tapViewWithAccessibilityLabel:@"Cancel" traits:UIAccessibilityTraitButton];
 }
 

From 80e88d361f528a79a518003e03440494f07d0adb Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 19 Oct 2015 14:59:13 +0200
Subject: [PATCH 4/4] prepare.py: display dummy libraries when generating SDK

---
 prepare.py               | 4 +++-
 submodules/cmake-builder | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index ac46643c2..b7d1196ee 100755
--- a/prepare.py
+++ b/prepare.py
@@ -388,7 +388,9 @@ sdk:
 \t\t{multiarch} \\
 \t\techo "[{archs}] Mixing `basename $$archive` in $$destpath"; \\
 \t\tlipo -create $$all_paths -output $$destpath; \\
-\tdone
+\tdone; \\
+\techo 'NOTE: the following libraries were STUBBED:'; \\
+\tcat WORK/ios-{first_arch}/Build/dummy_libraries/dummy_libraries.txt
 
 build: $(addsuffix -build, $(archs))
 \t$(MAKE) sdk
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index e5ddd8925..39bc0ebce 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit e5ddd892561b0c5df25b7036bd9229fe6a6ea81a
+Subproject commit 39bc0ebcebe3485b5cfcacbbe22092eeb97997a0