From 94bdcd7676c31ab67c619515cb888002f4ca1762 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 16 Nov 2015 15:37:59 +0100
Subject: [PATCH] Call: fix minor UI glitchs

---
 Classes/Base.lproj/CallIncomingView.xib     | 39 +++++++++------------
 Classes/Base.lproj/ChatConversationView.xib |  2 +-
 Classes/CallView.m                          |  4 ++-
 Classes/ChatConversationCreateTableView.m   |  2 +-
 submodules/cmake-builder                    |  2 +-
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Classes/Base.lproj/CallIncomingView.xib b/Classes/Base.lproj/CallIncomingView.xib
index 858a7e25..ecd72ca6 100644
--- a/Classes/Base.lproj/CallIncomingView.xib
+++ b/Classes/Base.lproj/CallIncomingView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CallIncomingView">
@@ -40,7 +40,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <animations/>
                             <accessibility key="accessibilityConfiguration" label="Contact avatar">
-                                <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
+                                <accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
                         </imageView>
@@ -103,8 +103,8 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                             <subviews>
                                 <button opaque="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="KnH-hj-g47" userLabel="declineButton">
-                                    <rect key="frame" x="1" y="0.0" width="124" height="63"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="125" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Decline"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
@@ -117,35 +117,35 @@
                                         <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="Nrs-UR-Hb9"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tX0-eE-di5" userLabel="acceptButton">
-                                    <rect key="frame" x="250" y="0.0" width="125" height="63"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="wYo-ty-Rwk" userLabel="acceptAudioOnlyButton">
+                                    <rect key="frame" x="125" y="0.0" width="125" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Accept"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" image="call_video_start_default.png" backgroundImage="color_A.png">
+                                    <state key="normal" image="call_audio_start_default.png" backgroundImage="color_A.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="disabled" image="call_video_start_disabled.png"/>
-                                    <state key="selected" image="call_video_start_disabled.png"/>
+                                    <state key="disabled" image="call_audio_start_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_L.png"/>
                                     <connections>
-                                        <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="XvK-9T-J2j"/>
+                                        <action selector="onAcceptAudioOnlyClick:" destination="-1" eventType="touchUpInside" id="N9h-i1-ejZ"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="wYo-ty-Rwk" userLabel="acceptAudioOnlyButton">
-                                    <rect key="frame" x="125" y="0.0" width="125" height="63"/>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tX0-eE-di5" userLabel="acceptButton">
+                                    <rect key="frame" x="250" y="0.0" width="125" height="63"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Accept"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" image="call_audio_start_default.png" backgroundImage="color_A.png">
+                                    <state key="normal" image="call_video_start_default.png" backgroundImage="color_A.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="disabled" image="call_audio_start_disabled.png"/>
+                                    <state key="disabled" image="call_video_start_disabled.png"/>
+                                    <state key="selected" image="call_video_start_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_L.png"/>
                                     <connections>
-                                        <action selector="onAcceptAudioOnlyClick:" destination="-1" eventType="touchUpInside" id="N9h-i1-ejZ"/>
+                                        <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="XvK-9T-J2j"/>
                                     </connections>
                                 </button>
                             </subviews>
@@ -177,9 +177,4 @@
         <image name="color_I.png" width="2" height="2"/>
         <image name="color_L.png" width="2" height="2"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/Base.lproj/ChatConversationView.xib b/Classes/Base.lproj/ChatConversationView.xib
index 8898c596..9013e94a 100644
--- a/Classes/Base.lproj/ChatConversationView.xib
+++ b/Classes/Base.lproj/ChatConversationView.xib
@@ -284,7 +284,7 @@
             </connections>
             <point key="canvasLocation" x="639" y="328"/>
         </tableViewController>
-        <swipeGestureRecognizer direction="right" id="dzw-n4-l9i">
+        <swipeGestureRecognizer direction="left" id="dzw-n4-l9i">
             <connections>
                 <action selector="onListSwipe:" destination="-1" id="bd8-v2-u8H"/>
             </connections>
diff --git a/Classes/CallView.m b/Classes/CallView.m
index 67020766..538cae55 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -431,7 +431,9 @@ - (void)showStatusBar:(BOOL)show {
 	 video to be resized, so hacking status bar instead*/
 	if (!show) {
 		UIView *statusView = PhoneMainView.instance.mainViewController.statusBarView;
-		blackVideoStatusBar.frame = statusView.frame;
+		CGRect frame = statusView.frame;
+		frame.origin.y = 0;
+		blackVideoStatusBar.frame = frame;
 		[statusView addSubview:blackVideoStatusBar];
 	} else {
 		[blackVideoStatusBar removeFromSuperview];
diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m
index 97662e66..5913fed4 100644
--- a/Classes/ChatConversationCreateTableView.m
+++ b/Classes/ChatConversationCreateTableView.m
@@ -51,7 +51,7 @@ - (void)reloadDataWithFilter:(NSString *)filter {
 		ms_free(uri);
 		linphone_address_destroy(addr);
 	}
-	if ([_contacts valueForKey:nsuri] == nil) {
+	if (nsuri.length > 0 && [_contacts valueForKey:nsuri] == nil) {
 		_contacts[nsuri] = filter;
 	}
 
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 2e2b398f..26a352f2 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 2e2b398fa1e6c30d445f06e8b2f842004368501a
+Subproject commit 26a352f2a4b70c2eb3bc57456bc882ce1710543a