This commit is contained in:
Nicolas Werner 2021-10-17 17:20:51 +02:00
parent 147dc9d4da
commit 6793bdf3fd
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
5 changed files with 18 additions and 9 deletions

View File

@ -237,8 +237,8 @@ Item {
console.log("STATUS CHANGED: " + SelfVerificationStatus.status); console.log("STATUS CHANGED: " + SelfVerificationStatus.status);
if (SelfVerificationStatus.status == SelfVerificationStatus.NoMasterKey) if (SelfVerificationStatus.status == SelfVerificationStatus.NoMasterKey)
bootstrapCrosssigning.open(); bootstrapCrosssigning.open();
else if (SelfVerificationStatus.status == SelfVerificationStatus.UnverifiedMasterKey) // else if (SelfVerificationStatus.status == SelfVerificationStatus.UnverifiedMasterKey)
verifyMasterKey.open(); // verifyMasterKey.open();
} }

View File

@ -631,8 +631,8 @@ DeviceVerificationFlow::sendVerificationRequest()
req.to = this->toClient.to_string(); req.to = this->toClient.to_string();
req.msgtype = "m.key.verification.request"; req.msgtype = "m.key.verification.request";
req.body = "User is requesting to verify keys with you. However, your client does " req.body = "User is requesting to verify keys with you. However, your client does "
"not support this method, so you will need to use the legacy method of " "not support this method, so you will need to use the legacy method of "
"key verification."; "key verification.";
} }
send(req); send(req);

View File

@ -45,4 +45,3 @@ private:
bool isInitialSync_ = false; bool isInitialSync_ = false;
RoomlistModel *rooms_; RoomlistModel *rooms_;
}; };

View File

@ -100,10 +100,16 @@ NotificationsManager::systemPostNotification(const QString &line1,
WinToast::instance()->showToast(templ, new CustomHandler()); WinToast::instance()->showToast(templ, new CustomHandler());
} }
void NotificationsManager::actionInvoked(uint, QString) {} void
void NotificationsManager::notificationReplied(uint, QString) {} NotificationsManager::actionInvoked(uint, QString)
{}
void
NotificationsManager::notificationReplied(uint, QString)
{}
void NotificationsManager::notificationClosed(uint, uint) {} void
NotificationsManager::notificationClosed(uint, uint)
{}
void void
NotificationsManager::removeNotification(const QString &, const QString &) NotificationsManager::removeNotification(const QString &, const QString &)

View File

@ -1114,7 +1114,11 @@ WebRTCSession::haveLocalPiP() const
return false; return false;
} }
bool WebRTCSession::createOffer(webrtc::CallType, uint32_t) { return false; } bool
WebRTCSession::createOffer(webrtc::CallType, uint32_t)
{
return false;
}
bool bool
WebRTCSession::acceptOffer(const std::string &) WebRTCSession::acceptOffer(const std::string &)