From 18103091cd8b1a56bf44c9390f7314e06ce9c9e4 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Mon, 1 Oct 2012 17:13:38 +0200
Subject: [PATCH] Update liphone submodule Update about view

---
 Classes/AboutViewController.h      |   3 +-
 Classes/AboutViewController.m      |  67 +++++++++++
 Classes/AboutViewController.xib    | 171 +++++++++++++++++++++++++----
 Resources/licenses.html            |  81 ++++++++++++++
 linphone.xcodeproj/project.pbxproj |   6 +
 submodules/linphone                |   2 +-
 6 files changed, 308 insertions(+), 22 deletions(-)
 create mode 100644 Resources/licenses.html

diff --git a/Classes/AboutViewController.h b/Classes/AboutViewController.h
index 92be76175..a486efbd1 100644
--- a/Classes/AboutViewController.h
+++ b/Classes/AboutViewController.h
@@ -21,13 +21,14 @@
 
 #import "UICompositeViewController.h"
 
-@interface AboutViewController : UIViewController<UICompositeViewDelegate> {
+@interface AboutViewController : UIViewController<UICompositeViewDelegate, UIWebViewDelegate> {
 }
 
 @property (nonatomic, retain) IBOutlet UILabel *linphoneIphoneVersionLabel;
 @property (nonatomic, retain) IBOutlet UILabel *linphoneCoreVersionLabel;
 @property (nonatomic, retain) IBOutlet UIView *contentView;
 @property (nonatomic, retain) IBOutlet UILabel *linkLabel;
+@property (nonatomic, retain) IBOutlet UIWebView *licensesView;
 @property (nonatomic, retain) IBOutlet UITapGestureRecognizer *linkTapGestureRecognizer;
 
 - (IBAction)onLinkTap:(id)sender;
diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m
index a83a5f934..1e2b5dddc 100644
--- a/Classes/AboutViewController.m
+++ b/Classes/AboutViewController.m
@@ -29,6 +29,7 @@
 @synthesize contentView;
 @synthesize linkTapGestureRecognizer;
 @synthesize linkLabel;
+@synthesize licensesView;
 
 
 #pragma mark - Lifecycle Functions
@@ -47,6 +48,7 @@
     [contentView release];
     [linkTapGestureRecognizer release];
     [linkLabel release];
+    [licensesView release];
     
     [super dealloc];
 }
@@ -70,6 +72,15 @@
     if([LinphoneManager runningOnIpad]) {
         [LinphoneUtils adjustFontSize:self.view mult:2.22f];
     }
+    
+    [AboutViewController removeBackground:licensesView];
+    
+    // Create a request to the resource
+    NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:[LinphoneManager bundleFile:@"licenses.html"]]] ;
+    // Load the resource using the request
+    [licensesView setDelegate:self];
+    [licensesView loadRequest:request];
+    [[AboutViewController defaultScrollView:licensesView] setScrollEnabled:FALSE];
 }
 
 
@@ -93,10 +104,66 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 
+#pragma mark -
+
++ (void)removeBackground:(UIView *)view {
+    for (UIView *subview in [view subviews]) {
+        [subview setOpaque:NO];
+        [subview setBackgroundColor:[UIColor clearColor]];
+    }
+    [view setOpaque:NO];
+    [view setBackgroundColor:[UIColor clearColor]];
+}
+
++ (UIScrollView *)defaultScrollView:(UIWebView *)webView {
+    UIScrollView *scrollView = nil;
+    
+    if ([[UIDevice currentDevice].systemVersion doubleValue] >= 5.0) {
+        return webView.scrollView;
+    }  else {
+        for (UIView *subview in [webView subviews]) {
+            if ([subview isKindOfClass:[UIScrollView class]]) {
+                scrollView = (UIScrollView *)subview;
+            }
+        }
+    }
+    return scrollView;
+}
+
+
 #pragma mark - Action Functions
 
 - (IBAction)onLinkTap:(id)sender {
     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:linkLabel.text]];
 }
 
+
+#pragma mark - UIWebViewDelegate Functions
+
+- (void)webViewDidFinishLoad:(UIWebView *)webView {
+    CGSize size = [webView sizeThatFits:CGSizeMake(self.view.bounds.size.width, 10000.0f)];
+    float diff = size.height - webView.bounds.size.height;
+    
+    UIScrollView *scrollView = (UIScrollView *)self.view;
+    CGRect contentFrame = [contentView bounds];
+    contentFrame.size.height += diff;
+    [contentView setAutoresizesSubviews:FALSE];
+    [contentView setFrame:contentFrame];
+    [contentView setAutoresizesSubviews:TRUE];
+    [scrollView setContentSize:contentFrame.size];
+    CGRect licensesViewFrame = [licensesView frame];
+    licensesViewFrame.size.height += diff;
+    [licensesView setFrame:licensesViewFrame];
+}
+
+- (BOOL)webView:(UIWebView *)inWeb shouldStartLoadWithRequest:(NSURLRequest *)inRequest navigationType:(UIWebViewNavigationType)inType {
+    if (inType == UIWebViewNavigationTypeLinkClicked) {
+        [[UIApplication sharedApplication] openURL:[inRequest URL]];
+        return NO;
+    }
+    
+    return YES;
+}
+
+
 @end
diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib
index ed5d7e7d4..7c0a4570c 100644
--- a/Classes/AboutViewController.xib
+++ b/Classes/AboutViewController.xib
@@ -17,6 +17,7 @@
 			<string>IBUILabel</string>
 			<string>IBUIScrollView</string>
 			<string>IBUIView</string>
+			<string>IBUIWebView</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,15 +39,25 @@
 			</object>
 			<object class="IBUIScrollView" id="457997634">
 				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">268</int>
+				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="IBUIClipsSubviews">YES</bool>
 				<bool key="IBUIMultipleTouchEnabled">YES</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<double key="IBUIContentInset.top">0.0</double>
+				<double key="IBUIContentInset.bottom">10</double>
+				<double key="IBUIContentInset.left">0.0</double>
+				<double key="IBUIContentInset.right">0.0</double>
 				<bool key="IBUIAlwaysBounceVertical">YES</bool>
 				<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
+				<double key="IBUIScrollIndicatorInsets.top">0.0</double>
+				<double key="IBUIScrollIndicatorInsets.bottom">10</double>
+				<double key="IBUIScrollIndicatorInsets.left">0.0</double>
+				<double key="IBUIScrollIndicatorInsets.right">0.0</double>
 			</object>
 			<object class="IBUIView" id="775128611">
 				<reference key="NSNextResponder"/>
@@ -58,6 +69,7 @@
 						<int key="NSvFlags">311</int>
 						<string key="NSFrame">{{124, 20}, {72, 72}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="945733244"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@@ -70,9 +82,10 @@
 					</object>
 					<object class="IBUILabel" id="945733244">
 						<reference key="NSNextResponder" ref="775128611"/>
-						<int key="NSvFlags">319</int>
-						<string key="NSFrame">{{20, 100}, {280, 50}}</string>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 100}, {300, 50}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="966549235"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -101,9 +114,10 @@
 					</object>
 					<object class="IBUILabel" id="55823705">
 						<reference key="NSNextResponder" ref="775128611"/>
-						<int key="NSvFlags">319</int>
-						<string key="NSFrame">{{20, 200}, {280, 44}}</string>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 200}, {300, 44}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="697092436"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -129,9 +143,10 @@
 					</object>
 					<object class="IBUILabel" id="966549235">
 						<reference key="NSNextResponder" ref="775128611"/>
-						<int key="NSvFlags">319</int>
-						<string key="NSFrame">{{20, 150}, {280, 21}}</string>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 150}, {300, 21}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="132342957"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -157,9 +172,10 @@
 					</object>
 					<object class="IBUILabel" id="132342957">
 						<reference key="NSNextResponder" ref="775128611"/>
-						<int key="NSvFlags">319</int>
-						<string key="NSFrame">{{20, 172}, {280, 21}}</string>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 172}, {300, 21}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="55823705"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -178,15 +194,17 @@
 					</object>
 					<object class="IBUILabel" id="28600489">
 						<reference key="NSNextResponder" ref="775128611"/>
-						<int key="NSvFlags">319</int>
-						<string key="NSFrame">{{20, 300}, {280, 21}}</string>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 300}, {300, 21}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="364833627"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<string key="IBUIText">© 2010 Belledonne Communications </string>
+						<string key="IBUIText">© 2010-2012 Belledonne Communications </string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
@@ -201,9 +219,10 @@
 					</object>
 					<object class="IBUILabel" id="697092436">
 						<reference key="NSNextResponder" ref="775128611"/>
-						<int key="NSvFlags">319</int>
-						<string key="NSFrame">{{20, 244}, {280, 36}}</string>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 244}, {300, 36}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="28600489"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -219,11 +238,23 @@
 						<reference key="IBUIFontDescription" ref="151194520"/>
 						<reference key="IBUIFont" ref="901921461"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<double key="preferredMaxLayoutWidth">280</double>
+						<double key="preferredMaxLayoutWidth">300</double>
+					</object>
+					<object class="IBUIWebView" id="364833627">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">314</int>
+						<string key="NSFrame">{{10, 380}, {300, 210}}</string>
+						<reference key="NSSuperview" ref="775128611"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIDataDetectorTypes">2</int>
 					</object>
 				</object>
-				<string key="NSFrameSize">{320, 341}</string>
+				<string key="NSFrameSize">{320, 600}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="97290309"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -276,6 +307,14 @@
 					</object>
 					<int key="connectionID">68</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">licensesView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="364833627"/>
+					</object>
+					<int key="connectionID">70</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -316,9 +355,10 @@
 							<reference ref="945733244"/>
 							<reference ref="132342957"/>
 							<reference ref="55823705"/>
-							<reference ref="28600489"/>
 							<reference ref="966549235"/>
 							<reference ref="697092436"/>
+							<reference ref="28600489"/>
+							<reference ref="364833627"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -326,7 +366,7 @@
 						<int key="objectID">61</int>
 						<reference key="object" ref="697092436"/>
 						<reference key="parent" ref="775128611"/>
-						<string key="objectName">licenceLabel</string>
+						<string key="objectName">licenseLabel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">58</int>
@@ -364,6 +404,12 @@
 						<reference key="parent" ref="775128611"/>
 						<string key="objectName">linphoneCoreVersionLabel</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">69</int>
+						<reference key="object" ref="364833627"/>
+						<reference key="parent" ref="775128611"/>
+						<string key="objectName">licenseView</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -383,6 +429,7 @@
 					<string>62.IBPluginDependency</string>
 					<string>65.IBPluginDependency</string>
 					<string>66.IBPluginDependency</string>
+					<string>69.IBPluginDependency</string>
 				</object>
 				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -399,6 +446,7 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -413,9 +461,92 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">68</int>
+			<int key="maxID">70</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">AboutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">onLinkTap:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">onLinkTap:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">onLinkTap:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>contentView</string>
+							<string>licensesView</string>
+							<string>linkLabel</string>
+							<string>linkTapGestureRecognizer</string>
+							<string>linphoneCoreVersionLabel</string>
+							<string>linphoneIphoneVersionLabel</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UIView</string>
+							<string>UIWebView</string>
+							<string>UILabel</string>
+							<string>UITapGestureRecognizer</string>
+							<string>UILabel</string>
+							<string>UILabel</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>contentView</string>
+							<string>licensesView</string>
+							<string>linkLabel</string>
+							<string>linkTapGestureRecognizer</string>
+							<string>linphoneCoreVersionLabel</string>
+							<string>linphoneIphoneVersionLabel</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">contentView</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">licensesView</string>
+								<string key="candidateClassName">UIWebView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">linkLabel</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">linkTapGestureRecognizer</string>
+								<string key="candidateClassName">UITapGestureRecognizer</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">linphoneCoreVersionLabel</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">linphoneIphoneVersionLabel</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AboutViewController.h</string>
+					</object>
+				</object>
+			</object>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff --git a/Resources/licenses.html b/Resources/licenses.html
new file mode 100644
index 000000000..e2ed49572
--- /dev/null
+++ b/Resources/licenses.html
@@ -0,0 +1,81 @@
+<html>
+<body>
+<div style="text-align:center;">
+<h1>Third party softwares</h1>
+
+<h3>CAAnimationBlocks</h3>
+
+<p>Xissburg<br />
+<a href="http://xissburg.com">http://xissburg.com</a></p>
+
+<h3>ColorConverter</h3>
+
+<p>Matteo Alessani<br />
+<a href="http://www.extendi.it">http://www.extendi.it</a></p>
+
+<h3>DCRoundSwitch</h3>
+
+<p>Patrick Richards<br />
+<a href="http://domesticcat.com.au">http://domesticcat.com.au</a><br />
+<em>MIT license</em></p>
+
+<h3>DTFoundation</h3>
+
+<p>Oliver Drobnik<br />
+<a href="http://www.cocoanetics.com">http://www.cocoanetics.com</a><br />
+<em>BSD license</em></p>
+
+<h3>HPGrowingTextView</h3>
+
+<p>Hans Pinckaers<br />
+<a href="http://hanspinckaers.com">http://hanspinckaers.com</a><br />
+<em>MIT license</em></p>
+
+<h3>InAppSettingsKit</h3>
+
+<p>Luc Vandal, Edovia Inc., Ortwin Gentz, FutureTap GmbH<br />
+<a href="http://www.inappsettingskit.com/">http://www.inappsettingskit.com/</a><br />
+<em>BSD license</em></p>
+
+<h3>NinePatch</h3>
+
+<p>Tortuga 22, Inc.<br />
+<a href="http://www.tortuga22.com">http://www.tortuga22.com</a><br />
+<em>Apache license</em></p>
+
+<h3>OrderedDictionary</h3>
+
+<p>Matt Gallagher<br />
+<a href="http://cocoawithlove.com">http://cocoawithlove.com</a></p>
+
+<h3>TPMultiLayoutViewController</h3>
+
+<p>Michael Tyson<br />
+<a href="http://atastypixel.com">http://atastypixel.com</a><br />
+<em>MIT license</em></p>
+
+<h3>UACellBackgroundView</h3>
+
+<p>Matt Coneybeare<br />
+<a href="http://code.coneybeare.net">http://code.coneybeare.net</a></p>
+
+<h3>XMLRPC</h3>
+
+<p>Eric Czarny<br />
+<a href="http://divisiblebyzero.com/">http://divisiblebyzero.com/</a><br />
+<em>MIT license</em></p>
+
+<h1>Graphics</h1>
+
+<h3>Kerosine</h3>
+
+<p><a href="http://www.kerosine.fr">http://www.kerosine.fr</a></p>
+
+<h1>Utilitary softwares</h1>
+
+<h3>Localization Suite</h3>
+
+<p><a href="http://www.loc-suite.org">http://www.loc-suite.org</a></p>
+</div>
+</body>
+</html>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index f32a22d72..4f3273d6d 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -703,6 +703,8 @@
 		D37DC7191594AF3F00B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; };
 		D37E3ECD1619C27A0087659A /* CAAnimation+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */; };
 		D37E3ECE1619C27A0087659A /* CAAnimation+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */; };
+		D37E3ED01619DCC50087659A /* licenses.html in Resources */ = {isa = PBXBuildFile; fileRef = D37E3ECF1619DCC50087659A /* licenses.html */; };
+		D37E3ED11619DCC50087659A /* licenses.html in Resources */ = {isa = PBXBuildFile; fileRef = D37E3ECF1619DCC50087659A /* licenses.html */; };
 		D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EE916006F0700B92522 /* libmediastreamer_base.a */; };
 		D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EEA16006F0700B92522 /* libmediastreamer_voip.a */; };
 		D37EE10B16032DC2003608A6 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EE916006F0700B92522 /* libmediastreamer_base.a */; };
@@ -1846,6 +1848,7 @@
 		D37DC7171594AF3400B2A5EB /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CAAnimation+Blocks.h"; sourceTree = "<group>"; };
 		D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CAAnimation+Blocks.m"; sourceTree = "<group>"; };
+		D37E3ECF1619DCC50087659A /* licenses.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = licenses.html; path = Resources/licenses.html; sourceTree = "<group>"; };
 		D37EE10F16035793003608A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ImageViewController.xib; sourceTree = "<group>"; };
 		D37EE11116036197003608A6 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/ImageViewController.xib; sourceTree = "<group>"; };
 		D37EE160160377D7003608A6 /* DTActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTActionSheet.h; sourceTree = "<group>"; };
@@ -3141,6 +3144,7 @@
 				D3432A70158A45AF001C6B0B /* led_disconnected.png */,
 				D3432A5D158A4446001C6B0B /* led_error.png */,
 				D3432A6F158A45AF001C6B0B /* led_inprogress.png */,
+				D37E3ECF1619DCC50087659A /* licenses.html */,
 				225CB2F911ABB76400628906 /* linphone-banner.png */,
 				8D1107310486CEB800E47090 /* linphone-Info.plist */,
 				22058C70116E305000B08DDD /* linphone_icon_57.png */,
@@ -4176,6 +4180,7 @@
 				D3D52A871614495300DEB00A /* decline_default~ipad.png in Resources */,
 				D3D52A891614495300DEB00A /* decline_over_landscape~ipad.png in Resources */,
 				D3D52A8B1614495300DEB00A /* decline_over~ipad.png in Resources */,
+				D37E3ED01619DCC50087659A /* licenses.html in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4677,6 +4682,7 @@
 				D3D52A881614495300DEB00A /* decline_default~ipad.png in Resources */,
 				D3D52A8A1614495300DEB00A /* decline_over_landscape~ipad.png in Resources */,
 				D3D52A8C1614495300DEB00A /* decline_over~ipad.png in Resources */,
+				D37E3ED11619DCC50087659A /* licenses.html in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/submodules/linphone b/submodules/linphone
index 4cd61b605..c6235d70a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4cd61b605d7e848ca735b6fb649b18a4cbfe3e7a
+Subproject commit c6235d70a0b49c015ca1551d2946370b69b4882d