mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_share_fix' into dev_group_chat

Browse source
This commit is contained in:
Danmei Chen 2018-06-18 15:06:30 +02:00
commit 0ede215f8b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/LinphoneUI/UIChatBubblePhotoCell.m
View file

@ -116,7 +116,7 @@
imageSize = [UIChatBubbleTextCell getMediaMessageSizefromOriginalSize:[representation dimensions] withWidth:chatTableView.tableView.frame.size.width];
CGImageRef tmpImg = [self cropImageFromRepresentation:representation];
UIImage *image = [[UIImage alloc] initWithCGImage:tmpImg];
[self loadImageAsset:nil thumb:thumb image:image];
[self loadImageAsset:asset thumb:thumb image:image];
}
- (void) loadVideoAsset: (AVAsset *) asset {

2
Classes/Utils/FileTransferDelegate.m
View file

@ -240,7 +240,7 @@ static LinphoneBuffer *linphone_iphone_file_transfer_send(LinphoneChatMessage *m
contents:[NSMutableData dataWithData:data]
attributes:nil];
if ([[url pathExtension]isEqualToString:@"MOV"])
if ([[url pathExtension] isEqualToString:@"MOV"])
[self uploadData:data forChatRoom:chatRoom type:nil subtype:nil name:name key:@"localvideo" keyData:name qualityData:nil];
else
[self uploadData:data forChatRoom:chatRoom type:@"file" subtype:nil name:name key:@"localfile" keyData:name qualityData:nil];