diff --git a/linphone-app/src/components/content/ContentModel.cpp b/linphone-app/src/components/content/ContentModel.cpp index 4784d6718..509446cbe 100644 --- a/linphone-app/src/components/content/ContentModel.cpp +++ b/linphone-app/src/components/content/ContentModel.cpp @@ -201,8 +201,7 @@ void ContentModel::downloadFile(){ break; default: - qWarning() << QStringLiteral("Unable to download file of entry %1. It was not uploaded.").arg(mChatMessageModel->getState()); - return; + qWarning() << QStringLiteral("Wrong message state when requesting downloading, state=%1.").arg(mChatMessageModel->getState()); } bool soFarSoGood; QString filename = getName();//mFileTransfertContent->getName(); diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml b/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml index 241b7ca90..d4b6728c7 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml @@ -86,7 +86,7 @@ Rectangle{ anchors.left: parent.left anchors.right: parent.right model: ContentProxyModel{ - chatMessageModel: replyPreviewBlock.chatRoomModel.reply + chatMessageModel: replyPreviewBlock.chatRoomModel && replyPreviewBlock.chatRoomModel.reply } height: contentHeight diff --git a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml index 35505f613..a5be2469e 100644 --- a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml +++ b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml @@ -124,12 +124,14 @@ ScrollableListView { visible: modelData.visible - onClicked: modelData.handler({ + onClicked: sipAddressesView.actions[index].handler({ // Do not use modelData on functions : Qt bug sipAddress: sipAddressesView.interpretableSipAddress }) Icon{ visible: modelData.secure>0 && - (modelData.secureIconVisibleHandler ? modelData.secureIconVisibleHandler({ sipAddress : sipAddressesView.interpretableSipAddress}) : true) + // Do not use modelData on functions : Qt bug + (sipAddressesView.actions[index].secureIconVisibleHandler ? sipAddressesView.actions[index].secureIconVisibleHandler({ sipAddress : sipAddressesView.interpretableSipAddress}) : true) + icon: 'secure_on' iconSize:15 anchors.right:parent.right @@ -285,12 +287,15 @@ ScrollableListView { colorSet: modelData.colorSet tooltipText:modelData.tooltipText?modelData.tooltipText:'' visible: modelData.visible - onClicked: { - modelData.handler(sipAddressEntry.entry) + onClicked: {// Do not use modelData on functions : Qt bug + sipAddressesView.actions[index].handler(sipAddressEntry.entry) + } Icon{ visible: modelData.secure>0 && - (modelData.secureIconVisibleHandler ? modelData.secureIconVisibleHandler(sipAddressEntry.entry) : true) + // Do not use modelData on functions : Qt bug + (sipAddressesView.actions[index].secureIconVisibleHandler ? sipAddressesView.actions[index].secureIconVisibleHandler(sipAddressEntry.entry) : true) + icon: 'secure_on' iconSize:15 anchors.right:parent.right