Merge branch 'master' into dev_vcard

.travis.yml

@@ -13,7 +13,6 @@ before_install:
     - chmod +x gas-preprocessor.pl
     - sudo mv gas-preprocessor.pl /usr/local/bin
     - sudo ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
-    - sudo ln -s /usr/bin/strings /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings
     - git submodule update --init --recursive
 
 install:

Classes/Base.lproj/ChatConversationCreateView.xib

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10089" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10072.1"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChatConversationCreateView">
             <connections>
+                <outlet property="backButton" destination="fNt-yb-wsf" id="ao7-bG-hIT"/>
                 <outlet property="tableController" destination="4" id="18"/>
                 <outlet property="view" destination="5" id="14"/>
             </connections>
@@ -27,12 +28,10 @@
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="jVg-vj-VOw" userLabel="backgroundColor">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                 </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="fNt-yb-wsf" userLabel="backButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
@@ -46,12 +45,10 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <animations/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" allowsMultipleSelectionDuringEditing="YES" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="6">
                             <rect key="frame" x="5" y="110" width="365" height="449"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <animations/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <color key="separatorColor" red="0.7254902124" green="0.76862746479999999" blue="0.79607844350000001" alpha="1" colorSpace="deviceRGB"/>
                             <connections>
@@ -62,18 +59,15 @@
                         <searchBar contentMode="redraw" id="Rd9-hK-nqR" userLabel="Contact address">
                             <rect key="frame" x="0.0" y="66" width="375" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <animations/>
                             <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no"/>
                             <connections>
                                 <outlet property="delegate" destination="4" id="MJr-oP-Hib"/>
                             </connections>
                         </searchBar>
                     </subviews>
-                    <animations/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
             </subviews>
-            <animations/>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
         </view>

Classes/ChatConversationCreateTableView.m

@@ -45,7 +45,7 @@
 	}];
 	// also add current entry, if not listed
 	NSString *nsuri = filter.lowercaseString;
-	LinphoneAddress *addr = linphone_address_new(nsuri.UTF8String);
+	LinphoneAddress *addr = linphone_core_interpret_url(LC, nsuri.UTF8String);
 	if (addr) {
 		char *uri = linphone_address_as_string(addr);
 		nsuri = [NSString stringWithUTF8String:uri];

Classes/ChatConversationCreateView.h

@@ -13,6 +13,7 @@
 @interface ChatConversationCreateView : UIViewController <UICompositeViewDelegate>
 
 @property(strong, nonatomic) IBOutlet ChatConversationCreateTableView *tableController;
+@property(weak, nonatomic) IBOutlet UIIconButton *backButton;
 
 - (IBAction)onBackClick:(id)sender;
 

Classes/ChatConversationCreateView.m

@@ -32,6 +32,15 @@ static UICompositeViewDescription *compositeDescription = nil;
 	return self.class.compositeViewDescription;
 }
 
+- (void)viewDidLoad {
+	[super viewDidLoad];
+
+	// if we use fragments, remove back button
+	if (IPAD) {
+		_backButton.hidden = YES;
+	}
+}
+
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
 	[_tableController.tableView reloadData];

Classes/ContactDetailsView.m

@@ -104,7 +104,7 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
 	// Save address book
 	error = NULL;
 	inhibUpdate = TRUE;
-	ABAddressBookSave(addressBook, (CFErrorRef *)&error);
+	ABAddressBookSave(addressBook, &error);
 	inhibUpdate = FALSE;
 	if (error != NULL) {
 		LOGE(@"Save AddressBook: Fail(%@)", [(__bridge NSError *)error localizedDescription]);

LiblinphoneTester/MasterView.m

@@ -41,6 +41,7 @@ NSString *const kLogsUpdateNotification = @"kLogsUpdateNotification";
 	lastLogs = [[NSMutableArray alloc] initWithCapacity:kLastLogsCapacity];
 	logsBuffer = [NSMutableArray arrayWithCapacity:kLogsBufferCapacity];
 	[Log enableLogs:ORTP_DEBUG];
+	linphone_core_enable_log_collection(NO);
 }
 
 void tester_logs_handler(int level, const char *fmt, va_list args) {

Tools/generate_icons.sh

@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# tag_missing_resources.sh
-#
-# Copyright (C) 2012  Belledonne Comunications, Grenoble, France
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Created by Gautier Pelloux-Prayer on 2014/10/22.
-# Given a new icon, this script will generate all needed icons for the application
-# and replace them in Ressources/.
-
-if [ $# != 1 ]; then
-	echo "Usage: $0 logo.png"
-	exit 0
-elif [ ! -f $1 ]; then
-	echo "Icon $1 does not exist"
-	exit 1
-fi
-
-icon_prefix="linphone_icon"
-
-# quit on first error
-set -e
-
-logo=$1
-logo_size=$(identify $logo | cut -d' ' -f3)
-logo_sizex=$(echo $logo_size | cut -d x -f1)
-logo_sizey=$(echo $logo_size | cut -d x -f2)
-
-if [ "$logo_sizex" != "$logo_sizey" ] || [ $logo_sizex -lt 512 ]; then
-	echo "Provide a high SQUARED resolution image (512x512 or higher). Current is $logo_size"
-	exit 1
-fi
-
-resources=$(dirname $0)/../Resources/
-
-for file in $(find $(dirname $0)/.. -name "$icon_prefix*.png" -or -name "iTunesArtwork*" ); do
-	dimension=$(identify $file | cut -d' ' -f3 | cut -d x -f1)
-	echo "Resizing to dimension ${dimension}x${dimension} for $(basename $file)"
-	convert $logo -resize ${dimension}x${dimension} $file
-done
-
-echo "**********************
-Done.
-**********************"

submodules/cmake-builder

@@ -1 +1 @@
-Subproject commit 4b3687ed3162b291f85cfa0f819413da398cad1a
+Subproject commit 68319103531f4b996e25f8f3131d7af8390a963d

submodules/externals/libmatroska-c

@@ -1 +1 @@
-Subproject commit b5254a96518b962a9738aa6c6f7dc28b5f312793
+Subproject commit 9837df79acb64f81670e464665985b09c4d0a994

submodules/externals/opus

@@ -1 +1 @@
-Subproject commit da97db1ca1f92592af3534c9a2596da0e9a009ca
+Subproject commit 96a78acaca1970c20e9ee7b1dd253b36d8deb56b

submodules/externals/polarssl

@@ -1 +1 @@
-Subproject commit 3b7c2443e75e51b7af67a3e5dcb3771ae3120ff3
+Subproject commit b6cc048a387f51c1f04c7f20a2056da833d65172