d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix verification start to start with request

Browse source
This commit is contained in:
Nicolas Werner 2020-10-02 12:18:54 +02:00
parent 94690ebd4c
commit 54e3c2c96b
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/device-verification/DeviceVerification.qml
View file

@ -6,7 +6,6 @@ import im.nheko 1.0
ApplicationWindow {
property var flow
property bool isRequest
property var tran_id
title: stack.currentItem.title

2
resources/qml/device-verification/NewVerificationRequest.qml
View file

@ -64,7 +64,7 @@ Pane {
}
onClicked: {
stack.replace(awaitingVerificationRequestAccept);
isRequest?flow.sendVerificationRequest():flow.startVerificationRequest(); }
flow.sender ?flow.sendVerificationRequest():flow.startVerificationRequest(); }
}
}
}

7
src/DeviceVerificationFlow.cpp
View file

@ -498,14 +498,13 @@ DeviceVerificationFlow::sendVerificationRequest()
mtx::events::msg::KeyVerificationRequest req;
req.from_device = http::client()->device_id();
req.methods.resize(1);
req.methods[0] = mtx::events::msg::VerificationMethods::SASv1;
req.methods = {mtx::events::msg::VerificationMethods::SASv1};
if (this->type == DeviceVerificationFlow::Type::ToDevice) {
QDateTime CurrentTime = QDateTime::currentDateTimeUtc();
QDateTime currentTime = QDateTime::currentDateTimeUtc();
req.transaction_id = this->transaction_id;
req.timestamp = (uint64_t)CurrentTime.toTime_t();
req.timestamp = (uint64_t)currentTime.toMSecsSinceEpoch();
mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationRequest> body;

2
src/DeviceVerificationFlow.h
View file

@ -111,7 +111,7 @@ private:
// general
QString userId;
QString deviceId;
Method method;
Method method = Method::Emoji;
Type type;
bool sender;
QTimer *timeout = nullptr;