lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

swarm: swarmify the message view

Browse source 
Change-Id: I85a070e8ea44b108fa75d69a8c6f544e8e2c8581
This commit is contained in:
Andreas Traczyk 2021-07-23 16:38:25 -04:00
parent 488d735dfd
commit 397b799cbf
11 changed files with 77 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/conversationlistmodelbase.cpp
View file

@ -129,6 +129,8 @@ ConversationListModelBase::dataForItem(item_t item, int role) const
}
case Role::IsSwarm:
return QVariant(item.isSwarm());
case Role::IsCoreDialog:
return QVariant(item.isCoreDialog());
case Role::Mode:
return QVariant(static_cast<int>(item.mode));
case Role::UID:
@ -163,6 +165,7 @@ ConversationListModelBase::dataForItem(item_t item, int role) const
contactModel = lrcInstance_->getCurrentAccountInfo().contactModel.get();
contact = contactModel->getContact(peerUri);
} catch (const std::exception&) {
qWarning() << Q_FUNC_INFO << "Can't find contact" << peerUri;
return {};
}

1
src/conversationlistmodelbase.h
View file

@ -35,6 +35,7 @@
X(LastInteraction) \
X(ContactType) \
X(IsSwarm) \
X(IsCoreDialog) \
X(IsBanned) \
X(UID) \
X(InCall) \

25
src/conversationsadapter.cpp
View file

@ -397,15 +397,17 @@ ConversationsAdapter::getConvInfoMap(const QString& convId)
const auto& convInfo = lrcInstance_->getConversationFromConvUid(convId);
if (convInfo.participants.empty())
return {};
auto peerUri = convInfo.participants[0];
ContactModel* contactModel {nullptr};
contact::Info contact {};
try {
const auto& accountInfo = lrcInstance_->getAccountInfo(convInfo.accountId);
contactModel = accountInfo.contactModel.get();
contact = contactModel->getContact(peerUri);
} catch (...) {
QString peerUri {};
QString bestId {};
if (convInfo.isCoreDialog()) {
try {
const auto& accountInfo = lrcInstance_->getAccountInfo(convInfo.accountId);
peerUri = accountInfo.conversationModel->peersForConversation(convId).at(0);
bestId = accountInfo.contactModel->bestIdForContact(peerUri);
} catch (...) {
}
}
bool isAudioOnly {false};
if (!convInfo.uid.isEmpty()) {
auto* call = lrcInstance_->getCallInfoForConversation(convInfo);
@ -426,14 +428,13 @@ ConversationsAdapter::getConvInfoMap(const QString& convId)
|| (call.isOutgoing && call.status != call::Status::ENDED));
callState = call.status;
}
// WARNING: not swarm ready
// titles should come from conversation, not contact model
return {{"convId", convId},
{"bestId", contactModel->bestIdForContact(peerUri)},
{"bestId", bestId},
{"title", lrcInstance_->getCurrentConversationModel()->title(convId)},
{"uri", peerUri},
{"isSwarm", convInfo.isSwarm()},
{"contactType", static_cast<int>(contact.profileInfo.type)},
{"isRequest", convInfo.isRequest},
{"needsSyncing", convInfo.needsSyncing},
{"isAudioOnly", isAudioOnly},
{"callState", static_cast<int>(callState)},
{"callStackViewShouldShow", callStackViewShouldShow}};

4
src/mainview/MainView.qml
View file

@ -184,7 +184,7 @@ Rectangle {
if (inSettingsView) {
toggleSettingsView()
}
MessagesAdapter.setupChatView(convId)
MessagesAdapter.setupChatView(item)
callStackView.setLinkedWebview(communicationPageMessageWebView)
callStackView.responsibleAccountId = LRCInstance.currentAccountId
callStackView.responsibleConvUid = convId
@ -203,7 +203,7 @@ Rectangle {
} else if (!inSettingsView) {
if (currentConvUID !== convId) {
callStackView.needToCloseInCallConversationAndPotentialWindow()
MessagesAdapter.setupChatView(convId)
MessagesAdapter.setupChatView(item)
pushCommunicationMessageWebView()
communicationPageMessageWebView.focusMessageWebView()
currentConvUID = convId

20
src/mainview/components/ConversationListView.qml
View file

@ -131,23 +131,23 @@ ListView {
var item = {
"convId": model.dataForRow(row, ConversationList.UID),
"displayId": model.dataForRow(row, ConversationList.BestId),
"displayName": model.dataForRow(row, ConversationList.Title),
"title": model.dataForRow(row, ConversationList.Title),
"uri": model.dataForRow(row, ConversationList.URI),
"contactType": model.dataForRow(row, ConversationList.ContactType),
"isSwarm": model.dataForRow(row, ConversationList.IsSwarm),
"isSwarm": model.dataForRow(row, ConversationList.IsSwarm)
}
responsibleAccountId = LRCInstance.currentAccountId
responsibleConvUid = item.convId
isSwarm = item.isSwarm
contactType = item.contactType
contactType = LRCInstance.currentAccountType
userProfile.responsibleConvUid = item.convId
userProfile.aliasText = item.displayName
userProfile.registeredNameText = item.displayId
userProfile.idText = item.uri
userProfile.convId = item.convId
userProfile.isSwarm = item.isSwarm
if (model.dataForRow(row, ConversationList.IsCoreDialog)) {
userProfile.aliasText = item.title
userProfile.registeredNameText = item.displayId
userProfile.idText = item.uri
userProfile.convId = item.convId
userProfile.isSwarm = item.isSwarm
}
openMenu()
}

23
src/mainview/components/InvitationView.qml
View file

@ -30,9 +30,9 @@ import "../../commoncomponents"
Rectangle {
id: root
property string invitationViewImageId
property string invitationViewContactTitle
property bool invitationViewNeedSyncing: false
property alias imageId: avatar.imageId
property string title
property bool needSyncing
property real marginSize: 20
property real textMarginSize: 50
@ -49,7 +49,7 @@ Rectangle {
width: infoColumnLayout.width - textMarginSize
height: visible ? contentHeight : 0
visible: !invitationViewNeedSyncing
visible: !needSyncing
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -58,7 +58,7 @@ Rectangle {
color: JamiTheme.textColor
wrapMode: Text.Wrap
text: JamiStrings.invitationViewSentRequest.arg(invitationViewContactTitle)
text: JamiStrings.invitationViewSentRequest.arg(title)
}
ColumnLayout {
@ -69,7 +69,7 @@ Rectangle {
width: root.width
Avatar {
id: avatarImage
id: avatar
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: invitationViewSentRequestText.visible ? marginSize : 0
@ -77,8 +77,7 @@ Rectangle {
Layout.preferredWidth: JamiTheme.invitationViewAvatarSize
showPresenceIndicator: false
mode: Avatar.Mode.Contact
imageId: invitationViewImageId
mode: Avatar.Mode.Conversation
}
Text {
@ -96,7 +95,7 @@ Rectangle {
color: JamiTheme.textColor
wrapMode: Text.Wrap
text: root.invitationViewNeedSyncing ?
text: needSyncing ?
JamiStrings.invitationViewAcceptedConversation :
JamiStrings.invitationViewJoinConversation
}
@ -109,7 +108,7 @@ Rectangle {
Layout.preferredWidth: infoColumnLayout.width - textMarginSize
Layout.preferredHeight: visible ? contentHeight : 0
visible: invitationViewNeedSyncing
visible: needSyncing
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@ -118,7 +117,7 @@ Rectangle {
color: JamiTheme.textColor
wrapMode: Text.Wrap
text: JamiStrings.invitationViewWaitingForSync.arg(invitationViewContactTitle)
text: JamiStrings.invitationViewWaitingForSync.arg(title)
}
RowLayout {
@ -129,7 +128,7 @@ Rectangle {
spacing: JamiTheme.invitationViewButtonsSpacing
visible: !invitationViewNeedSyncing
visible: !needSyncing
PushButton {
id: blockButton

8
src/mainview/components/MessageWebView.qml
View file

@ -115,7 +115,7 @@ Rectangle {
target: MessagesAdapter
function onChangeInvitationViewRequest(show, isSwarm, needsSyncing,
contactTitle, contactUri) {
title, convId) {
if (show)
root.mode = MessageWebView.Mode.Invitation
else {
@ -123,9 +123,9 @@ Rectangle {
return
}
invitationView.invitationViewImageId = contactUri
invitationView.invitationViewContactTitle = contactTitle
invitationView.invitationViewNeedSyncing = needsSyncing
invitationView.imageId = convId
invitationView.title = title
invitationView.needSyncing = needsSyncing
}
}

2
src/mainview/components/SmartListItemDelegate.qml
View file

@ -47,7 +47,7 @@ ItemDelegate {
id: avatar
imageId: UID
showPresenceIndicator: Presence
showPresenceIndicator: Presence !== undefined ? Presence : false
Layout.preferredWidth: JamiTheme.smartListAvatarSize
Layout.preferredHeight: JamiTheme.smartListAvatarSize

23
src/mainview/components/UserProfile.qml
View file

@ -28,12 +28,11 @@ import "../../commoncomponents"
BaseDialog {
id: root
property string responsibleConvUid: ""
property string convId: ""
property string aliasText: ""
property string registeredNameText: ""
property string idText: ""
property bool isSwarm: false
property string convId
property string aliasText
property string registeredNameText
property string idText
property bool isSwarm
property int preferredImgSize: 80
@ -200,7 +199,12 @@ BaseDialog {
fillMode: Image.PreserveAspectFit
sourceSize.width: preferredImgSize
sourceSize.height: preferredImgSize
mipmap: true
mipmap: false
smooth: false
source: convId !== "" ?
"image://qrImage/contact_" + convId :
""
}
Text {
@ -238,9 +242,4 @@ BaseDialog {
}
}
}
onResponsibleConvUidChanged: {
if (responsibleConvUid !== "")
contactQrImage.source = "image://qrImage/contact_" + responsibleConvUid
}
}

51
src/messagesadapter.cpp
View file

@ -57,44 +57,31 @@ MessagesAdapter::safeInit()
}
void
MessagesAdapter::setupChatView(const QString& convUid)
MessagesAdapter::setupChatView(const QVariantMap& convInfo)
{
auto* convModel = lrcInstance_->getCurrentConversationModel();
if (convModel == nullptr) {
return;
}
const auto& convInfo = lrcInstance_->getConversationFromConvUid(convUid);
if (convInfo.uid.isEmpty() || convInfo.participants.isEmpty()) {
return;
}
QString contactURI = convInfo.participants.at(0);
auto selectedAccountId = lrcInstance_->get_currentAccountId();
auto& accountInfo = lrcInstance_->accountModel().getAccountInfo(selectedAccountId);
bool isLegacy = !convInfo["isSwarm"].toBool();
bool isRequest = convInfo["isRequest"].toBool();
bool needsSyncing = convInfo["needsSyncing"].toBool();
QMetaObject::invokeMethod(qmlObj_,
"setSendContactRequestButtonVisible",
Q_ARG(QVariant, convInfo.isLegacy() && convInfo.isRequest));
Q_ARG(QVariant, isLegacy && isRequest));
QMetaObject::invokeMethod(qmlObj_,
"setMessagingHeaderButtonsVisible",
Q_ARG(QVariant,
!(convInfo.isLegacy()
&& (convInfo.isRequest || convInfo.needsSyncing))));
Q_ARG(QVariant, !(isLegacy && (isRequest || needsSyncing))));
setMessagesVisibility(false);
setIsSwarm(convInfo.isSwarm());
changeInvitationViewRequest(convInfo.isRequest or convInfo.needsSyncing,
!convInfo.isSwarm(),
convInfo.needsSyncing,
convModel->title(convInfo.uid),
contactURI);
setIsSwarm(!isLegacy);
Q_EMIT changeInvitationViewRequest(isRequest || needsSyncing,
isLegacy,
needsSyncing,
convInfo["title"].toString(),
convInfo["convId"].toString());
Utils::oneShotConnect(qmlObj_, SIGNAL(messagesCleared()), this, SLOT(slotMessagesCleared()));
clearChatView();
Q_EMIT newMessageBarPlaceholderText(accountInfo.contactModel->bestNameForContact(contactURI));
Q_EMIT newMessageBarPlaceholderText(convInfo["title"].toString());
}
void
@ -385,13 +372,15 @@ MessagesAdapter::setConversationProfileData(const lrc::api::conversation::Info&
!(convInfo.isSwarm()
&& (convInfo.isRequest || convInfo.needsSyncing))));
changeInvitationViewRequest(convInfo.isRequest or convInfo.needsSyncing,
convInfo.isSwarm(),
convInfo.needsSyncing,
title,
contactUri);
Q_EMIT changeInvitationViewRequest(convInfo.isRequest or convInfo.needsSyncing,
convInfo.isSwarm(),
convInfo.needsSyncing,
title,
convInfo.uid);
if (convInfo.isSwarm())
return;
// TODO: swarmify me
auto& contact = accInfo->contactModel->getContact(contactUri);
bool isPending = contact.profileInfo.type == profile::Type::TEMPORARY;
QMetaObject::invokeMethod(qmlObj_,

2
src/messagesadapter.h
View file

@ -41,7 +41,7 @@ public:
protected:
void safeInit() override;
Q_INVOKABLE void setupChatView(const QString& convUid);
Q_INVOKABLE void setupChatView(const QVariantMap& convInfo);
Q_INVOKABLE void connectConversationModel();
Q_INVOKABLE void sendConversationRequest();
Q_INVOKABLE void removeConversation(const QString& accountId,