Compare commits
3 Commits
release/25
...
work/redst
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
504646baf2 | ||
|
|
280d194311 | ||
|
|
bcac768b34 |
@@ -1602,6 +1602,12 @@ void NeoChatRoom::downloadEventFromServer(const QString &eventId)
|
|||||||
}
|
}
|
||||||
|
|
||||||
event_ptr_tt<RoomEvent> event = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
|
event_ptr_tt<RoomEvent> event = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
|
||||||
|
if (auto encEv = eventCast<EncryptedEvent>(event.get())) {
|
||||||
|
auto decryptedEvent = decryptMessage(*encEv);
|
||||||
|
if (decryptedEvent) {
|
||||||
|
event = std::move(decryptedEvent);
|
||||||
|
}
|
||||||
|
}
|
||||||
m_extraEvents.push_back(std::move(event));
|
m_extraEvents.push_back(std::move(event));
|
||||||
Q_EMIT extraEventLoaded(eventId);
|
Q_EMIT extraEventLoaded(eventId);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import org.kde.kitemmodels
|
|||||||
|
|
||||||
import org.kde.neochat.libneochat
|
import org.kde.neochat.libneochat
|
||||||
import org.kde.neochat.timeline as Timeline
|
import org.kde.neochat.timeline as Timeline
|
||||||
|
import org.kde.neochat.settings as Settings
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Page for holding a room drawer component.
|
* @brief Page for holding a room drawer component.
|
||||||
@@ -50,7 +51,7 @@ Kirigami.Page {
|
|||||||
text: i18nc("@action:button", "Room settings")
|
text: i18nc("@action:button", "Room settings")
|
||||||
icon.name: 'settings-configure-symbolic'
|
icon.name: 'settings-configure-symbolic'
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
RoomSettingsView.openRoomSettings(root.room, RoomSettingsView.Room);
|
Settings.RoomSettingsView.openRoomSettings(root.room, Settings.RoomSettingsView.Room);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ QQC2.ItemDelegate {
|
|||||||
topPadding: 0
|
topPadding: 0
|
||||||
bottomPadding: 0
|
bottomPadding: 0
|
||||||
text: root.collapsed ? "" : root.displayName
|
text: root.collapsed ? "" : root.displayName
|
||||||
|
|
||||||
|
onClicked: root.treeView.toggleExpanded(row)
|
||||||
}
|
}
|
||||||
QQC2.ToolButton {
|
QQC2.ToolButton {
|
||||||
id: collapseButton
|
id: collapseButton
|
||||||
|
|||||||
Reference in New Issue
Block a user