Merge remote-tracking branch 'refs/remotes/origin/release/4.7'

Classes/ChatConversationView.m

@@ -329,7 +329,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 		return;
 	}
 	composingVisible = !composingVisible;
-	[self setComposingVisible:!composingVisible withDelay:0];
 
 	// force offset recomputing
 	[_messageField refreshHeight];
@@ -338,7 +337,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 		_chatRoom = linphone_core_get_chat_room([LinphoneManager getLc], peerAddr);
 		isOneToOne = linphone_chat_room_get_capabilities(_chatRoom) & LinphoneChatRoomCapabilitiesOneToOne;
 		isEncrypted = linphone_chat_room_get_capabilities(_chatRoom) & LinphoneChatRoomCapabilitiesEncrypted;
+		if (_chatRoom)
+			[self setComposingVisible:!composingVisible withDelay:0];
 	}
+
 	[self configureForRoom:true];
 	_backButton.hidden = _tableController.isEditing;
 	[_tableController scrollToBottom:true];
@@ -792,9 +794,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 		// if we're showing the compose message, update it position
 		if (![_composeLabel isHidden]) {
-			CGRect frame = [_composeLabel frame];
+			CGRect frame = [_composeIndicatorView frame];
 			frame.origin.y -= diff;
-			[_composeLabel setFrame:frame];
+			[_composeIndicatorView setFrame:frame];
 		}
 	}
 }

Classes/LinphoneUI/UICheckBoxTableView.m

@@ -91,8 +91,8 @@
 #pragma mark -
 
 - (void)accessoryForCell:(UITableViewCell *)cell atPath:(NSIndexPath *)indexPath {
-	cell.selectionStyle = UITableViewCellSelectionStyleGray;
 	if ([self isEditing]) {
+		cell.selectionStyle = UITableViewCellSelectionStyleGray;
 		UIButton *checkBoxButton = [UIButton buttonWithType:UIButtonTypeCustom];
 		UIImage *image = nil;
 		if ([_selectedItems containsObject:indexPath]) {

Classes/LinphoneUI/UIRecordingCell.h

@@ -25,8 +25,6 @@
 @property (weak, nonatomic) IBOutlet UILabel *nameLabel;
 @property (strong, nonatomic) IBOutlet UIToolbar *toolbar;
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *shareButton;
-
-
 @property(nonatomic, assign) __block NSString *recording;
 
 - (id)initWithIdentifier:(NSString*)identifier;

Classes/LinphoneUI/UIRecordingCell.m

@@ -90,7 +90,8 @@ static UILinphoneAudioPlayer *player;
 }
 
 - (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated {
-    self.selectionStyle = UITableViewCellSelectionStyleNone;
+	if (!VIEW(RecordingsListView).tableController.isEditing)
+		self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
 
 - (void)updateFrame {
@@ -105,10 +106,11 @@ static UILinphoneAudioPlayer *player;
 
 -(void)setSelected:(BOOL)selected animated:(BOOL)animated{
     [super setSelected:selected animated:animated];
-    _toolbar.hidden = !selected;
-    if (!selected) {
-        return;
-    }
+	
+	if (!selected || (selected && VIEW(RecordingsListView).tableController.isEditing)) {
+		_toolbar.hidden = true;
+		return;
+	}
 	if (player && [player isCreated]) {
 		[player close];
 	}
@@ -122,6 +124,7 @@ static UILinphoneAudioPlayer *player;
     player.view.frame = _playerView.frame;
     player.view.bounds = _playerView.bounds;
     [player open];
+	_toolbar.hidden = false;
 }
 
 - (void)onShareButtonPressed {

Classes/RecordingsListTableView.m

@@ -147,8 +147,6 @@
     NSString *recordingPath = subAr[indexPath.row];
     [cell setRecording:recordingPath];
     [super accessoryForCell:cell atPath:indexPath];
-    //accessoryForCell set it to gray but we don't want it
-    cell.selectionStyle = UITableViewCellSelectionStyleNone;
     [cell updateFrame];
 	cell.contentView.userInteractionEnabled = false;
     return cell;