From 8689faad8e3a44c81af0fc2c37730ad8308f46b9 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 22 Aug 2016 15:19:05 +0200
Subject: [PATCH] xcode: add missing permissions description required for ios10

---
 Classes/SideMenuView.m                        |  6 ++---
 .../AppIcon.appiconset/Contents.json          | 22 ++++++++++++++++++-
 linphone-Info.plist                           | 16 ++++++++++----
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/Classes/SideMenuView.m b/Classes/SideMenuView.m
index 956bde645..031b746ec 100644
--- a/Classes/SideMenuView.m
+++ b/Classes/SideMenuView.m
@@ -55,16 +55,14 @@
 	if (default_proxy != NULL) {
 		const LinphoneAddress *addr = linphone_proxy_config_get_identity_address(default_proxy);
 		[ContactDisplay setDisplayNameLabel:_nameLabel forAddress:addr];
-		char *as_string = linphone_address_as_string_uri_only(addr);
-		_addressLabel.text = [NSString stringWithUTF8String:as_string];
-		ms_free(as_string);
+		_addressLabel.text = [NSString stringWithUTF8String:linphone_proxy_config_get_identity(default_proxy)];
 		_presenceImage.image = [StatusBarView imageForState:linphone_proxy_config_get_state(default_proxy)];
 	} else {
 		_nameLabel.text = @"No account";
 		// display direct IP:port address so that we can be reached
 		LinphoneAddress *addr = linphone_core_get_primary_contact_parsed(LC);
 		if (addr) {
-			char *as_string = linphone_address_as_string_uri_only(addr);
+			char *as_string = linphone_address_as_string(addr);
 			_addressLabel.text = [NSString stringWithFormat:@"%s", as_string];
 			ms_free(as_string);
 			linphone_address_destroy(addr);
diff --git a/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
index 90730a624..1bb809de1 100644
--- a/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -48,6 +58,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -113,4 +133,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
\ No newline at end of file
diff --git a/linphone-Info.plist b/linphone-Info.plist
index bd185e0e8..8f8045281 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -60,6 +60,18 @@
 	<string>b5cb085f-772a-4a4f-8c77-5d1332b1f93f</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>Use your BT headset</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Share photos with your friends and customize avatars</string>
+	<key>NSContactsUsageDescription</key>
+	<string>Make calls with your friends</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Use microphone to make audio calls</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Share photos with your friends and customize avatars</string>
+	<key>NSVoIPUsageDescription</key>
+	<string>Make audio/video calls</string>
 	<key>UIApplicationExitsOnSuspend</key>
 	<false/>
 	<key>UIBackgroundModes</key>
@@ -99,9 +111,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSVoIPUsageDescription</key>
-	<string>Make audio/video calls</string>
-	<key>NSContactsUsageDescription</key>
-	<string>Make calls with your friends</string>
 </dict>
 </plist>