witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix crash when recive files

Browse source
This commit is contained in:
Danmei Chen 2020-05-21 23:13:35 +02:00
parent 94d7ef6a79
commit 2f69199305
2 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/ChatConversationView.m
View file

@ -1357,6 +1357,7 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
// define a block , not called immediately. To avoid crash when saving photo before PHAuthorizationStatusNotDetermined.
void (^block)(void)= ^ {
__block LinphoneChatMessage *msg = message;
if ([fileType isEqualToString:@"image"]) {
// we're finished, save the image and update the message
UIImage *image = [UIImage imageWithData:data];
@ -1388,10 +1389,9 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
LOGI(@"Image saved to [%@]", [placeHolder localIdentifier]);
[LinphoneManager setValueInMessageAppData:[placeHolder localIdentifier]
forKey:@"localimage"
inMessage:message];
inMessage:msg];
}
[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view];
[view.tableController scrollToLastUnread:TRUE];
});
}];
} else if([fileType isEqualToString:@"video"]) {
@ -1422,10 +1422,9 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
LOGI(@"video saved to [%@]", [placeHolder localIdentifier]);
[LinphoneManager setValueInMessageAppData:[placeHolder localIdentifier]
forKey:@"localvideo"
inMessage:message];
inMessage:msg];
}
[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view];
[view.tableController scrollToLastUnread:TRUE];
});
}];
}
@ -1454,7 +1453,6 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
[LinphoneManager setValueInMessageAppData:name forKey:key inMessage:message];
//[LinphoneManager setValueInMessageAppData:filePath forKey:@"cachedfile" inMessage:message];
[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view];
[view.tableController scrollToLastUnread:TRUE];
});} else {
LOGE(@"[Auto download error] can not save the file %@", name);
}

32
Classes/LinphoneManager.m
View file

@ -787,20 +787,6 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut
}
#pragma deploymate pop
NSString *callID = [NSString stringWithUTF8String:linphone_chat_message_get_custom_header(msg, "Call-ID")];
const LinphoneAddress *peerAddress = linphone_chat_room_get_peer_address(room);
NSString *from = [FastAddressBook displayNameForAddress:peerAddress];
const LinphoneAddress *fromAddress = linphone_chat_message_get_from_address(msg);
NSString *fromMsg = [FastAddressBook displayNameForAddress:fromAddress];
char *peer_address = linphone_address_as_string_uri_only(peerAddress);
NSString *peer_uri = [NSString stringWithUTF8String:peer_address];
ms_free(peer_address);
const LinphoneAddress *localAddress = linphone_chat_room_get_local_address(room);
char *local_address = localAddress? linphone_address_as_string_uri_only(localAddress) : "";
NSString *local_uri = [NSString stringWithUTF8String:local_address];
ms_free(local_address);
int index = [(NSNumber *)[_pushDict objectForKey:callID] intValue] - 1;
LOGI(@"Decrementing index of long running task for call id : %@ with index : %d", callID, index);
@ -828,6 +814,8 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut
return;
if (hasFile) {
if (PhoneMainView.instance.currentView == ChatConversationView.compositeViewDescription && room == PhoneMainView.instance.currentRoom)
return;
[ChatConversationView autoDownload:msg];
}
@ -840,22 +828,6 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut
};
[NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:self userInfo:dict];
if (linphone_chat_message_is_outgoing(msg))
return;
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
if ((PhoneMainView.instance.currentView == ChatsListView.compositeViewDescription))
return;
if (PhoneMainView.instance.currentView == ChatConversationView.compositeViewDescription && room == PhoneMainView.instance.currentRoom)
return;
}
// don't show msg notif when app in bg during a call : msgNotificationService extension will show a notif
if ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
return;
}
}
static void linphone_iphone_message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *message) {