diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index ea9c0d6b0..12237d2f5 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -147,7 +147,7 @@
-
+
@@ -741,7 +741,7 @@
-
+
diff --git a/Classes/Base.lproj/CallView~ipad.xib b/Classes/Base.lproj/CallView~ipad.xib
index 6b468d811..2c9c8035b 100644
--- a/Classes/Base.lproj/CallView~ipad.xib
+++ b/Classes/Base.lproj/CallView~ipad.xib
@@ -1,5 +1,5 @@
-
+
@@ -147,7 +147,7 @@
-
+
@@ -740,7 +740,7 @@
-
+
diff --git a/Classes/CallView.m b/Classes/CallView.m
index 15de76156..464deeb10 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -77,6 +77,9 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)viewDidLoad {
[super viewDidLoad];
+ _videoPreview.layer.borderColor = UIColor.whiteColor.CGColor;
+ _videoPreview.layer.borderWidth = 1;
+
[singleFingerTap setNumberOfTapsRequired:1];
[singleFingerTap setCancelsTouchesInView:FALSE];
[self.videoView addGestureRecognizer:singleFingerTap];
@@ -352,8 +355,8 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
}
// only show camera switch button if we have more than 1 camera
- _videoCameraSwitch.hidden = !disabled && ([LinphoneManager instance].frontCamId != nil);
- _videoPreview.hidden = (!disabled && !linphone_core_self_view_enabled([LinphoneManager getLc]));
+ _videoCameraSwitch.hidden = (disabled || !LinphoneManager.instance.frontCamId);
+ _videoPreview.hidden = (disabled || !linphone_core_self_view_enabled([LinphoneManager getLc]));
if (hideControlsTimer != nil) {
[hideControlsTimer invalidate];
diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m
index d44a0bb9b..16d493c32 100644
--- a/Classes/ContactDetailsView.m
+++ b/Classes/ContactDetailsView.m
@@ -55,14 +55,17 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
ABRecordID recordID = ABRecordGetRecordID(_contact);
ABAddressBookRevert(addressBook);
_contact = ABAddressBookGetPersonWithRecordID(addressBook, recordID);
- if (_contact == NULL) {
- [PhoneMainView.instance popCurrentView];
- return;
- }
- LOGI(@"Reset data to contact %p", _contact);
- [_avatarImage setImage:[FastAddressBook imageForContact:_contact thumbnail:NO] bordered:NO withRoundedRadius:YES];
- [_tableController setContact:[[Contact alloc] initWithPerson:_contact]];
+ if (_contact != NULL) {
+ LOGI(@"Reset data to contact %p", _contact);
+ [_avatarImage setImage:[FastAddressBook imageForContact:_contact thumbnail:NO]
+ bordered:NO
+ withRoundedRadius:YES];
+ [_tableController setContact:[[Contact alloc] initWithPerson:_contact]];
+ _emptyLabel.hidden = YES;
+ } else {
+ _emptyLabel.hidden = NO;
+ }
}
static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info, void *context) {
@@ -78,6 +81,7 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
[[[LinphoneManager instance] fastAddressBook] removeContact:_contact];
inhibUpdate = FALSE;
}
+ [PhoneMainView.instance popCurrentView];
}
- (void)saveData {
@@ -290,7 +294,6 @@ static UICompositeViewDescription *compositeDescription = nil;
onConfirmationClick:^() {
[self setEditing:FALSE];
[self removeContact];
- [PhoneMainView.instance popCurrentView];
}];
}
diff --git a/Classes/ContactsListView.h b/Classes/ContactsListView.h
index e16499907..c2df44da4 100644
--- a/Classes/ContactsListView.h
+++ b/Classes/ContactsListView.h
@@ -71,8 +71,7 @@ typedef enum _ContactSelectionMode { ContactSelectionModeNone, ContactSelectionM
@end
-@interface ContactsListView
- : UIViewController
+@interface ContactsListView : UIViewController
@property(strong, nonatomic) IBOutlet ContactsListTableView *tableController;
@property(strong, nonatomic) IBOutlet UIView *topBar;
diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m
index d9dad8b53..058aadc35 100644
--- a/Classes/ContactsListView.m
+++ b/Classes/ContactsListView.m
@@ -213,42 +213,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[searchBar resignFirstResponder];
}
-#pragma mark - Rotation handling
-
-//- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
-// [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-// // the searchbar overlaps the subview in most rotation cases, we have to re-layout the view manually:
-// [self relayoutTableView];
-//}
-
-#pragma mark - ABPeoplePickerDelegate
-
-- (void)peoplePickerNavigationControllerDidCancel:(ABPeoplePickerNavigationController *)peoplePicker {
- [PhoneMainView.instance popCurrentView];
- return;
-}
-
-- (BOOL)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)peoplePicker
- shouldContinueAfterSelectingPerson:(ABRecordRef)person {
- return true;
-}
-
-- (BOOL)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)peoplePicker
- shouldContinueAfterSelectingPerson:(ABRecordRef)person
- property:(ABPropertyID)property
- identifier:(ABMultiValueIdentifier)identifier {
-
- CFTypeRef multiValue = ABRecordCopyValue(person, property);
- CFIndex valueIdx = ABMultiValueGetIndexForIdentifier(multiValue, identifier);
- NSString *phoneNumber = (NSString *)CFBridgingRelease(ABMultiValueCopyValueAtIndex(multiValue, valueIdx));
- // Go to dialer view
- DialerView *view = VIEW(DialerView);
- [PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
- [view call:phoneNumber displayName:(NSString *)CFBridgingRelease(ABRecordCopyCompositeName(person))];
- CFRelease(multiValue);
- return false;
-}
-
#pragma mark - searchBar delegate
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
diff --git a/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib b/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib
index 7cd0c8bb0..d63cc47fd 100644
--- a/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIConfirmationDialog.xib
@@ -1,8 +1,8 @@
-
+
-
+
@@ -15,30 +15,27 @@
-
+
-
+
-
-
+
-
-
-
-
+
+