diff options
| -rw-r--r-- | resources/qml/SelfVerificationCheck.qml | 4 | ||||
| -rw-r--r-- | src/encryption/DeviceVerificationFlow.cpp | 4 | ||||
| -rw-r--r-- | src/encryption/VerificationManager.h | 1 | ||||
| -rw-r--r-- | src/notifications/ManagerWin.cpp | 12 | ||||
| -rw-r--r-- | src/voip/WebRTCSession.cpp | 6 |
5 files changed, 18 insertions, 9 deletions
diff --git a/resources/qml/SelfVerificationCheck.qml b/resources/qml/SelfVerificationCheck.qml index c5eee669..a7a9e41a 100644 --- a/resources/qml/SelfVerificationCheck.qml +++ b/resources/qml/SelfVerificationCheck.qml @@ -237,8 +237,8 @@ Item { console.log("STATUS CHANGED: " + SelfVerificationStatus.status); if (SelfVerificationStatus.status == SelfVerificationStatus.NoMasterKey) bootstrapCrosssigning.open(); - else if (SelfVerificationStatus.status == SelfVerificationStatus.UnverifiedMasterKey) - verifyMasterKey.open(); +// else if (SelfVerificationStatus.status == SelfVerificationStatus.UnverifiedMasterKey) +// verifyMasterKey.open(); } diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp index 2481d4f9..ea5a060d 100644 --- a/src/encryption/DeviceVerificationFlow.cpp +++ b/src/encryption/DeviceVerificationFlow.cpp @@ -631,8 +631,8 @@ DeviceVerificationFlow::sendVerificationRequest() req.to = this->toClient.to_string(); req.msgtype = "m.key.verification.request"; 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 " - "key verification."; + "not support this method, so you will need to use the legacy method of " + "key verification."; } send(req); diff --git a/src/encryption/VerificationManager.h b/src/encryption/VerificationManager.h index e00ddc10..d6a39ccf 100644 --- a/src/encryption/VerificationManager.h +++ b/src/encryption/VerificationManager.h @@ -45,4 +45,3 @@ private: bool isInitialSync_ = false; RoomlistModel *rooms_; }; - diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp index 4376e4d8..556ca028 100644 --- a/src/notifications/ManagerWin.cpp +++ b/src/notifications/ManagerWin.cpp @@ -100,10 +100,16 @@ NotificationsManager::systemPostNotification(const QString &line1, WinToast::instance()->showToast(templ, new CustomHandler()); } -void NotificationsManager::actionInvoked(uint, QString) {} -void NotificationsManager::notificationReplied(uint, QString) {} +void +NotificationsManager::actionInvoked(uint, QString) +{} +void +NotificationsManager::notificationReplied(uint, QString) +{} -void NotificationsManager::notificationClosed(uint, uint) {} +void +NotificationsManager::notificationClosed(uint, uint) +{} void NotificationsManager::removeNotification(const QString &, const QString &) diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp index 801a365c..8e0a9f79 100644 --- a/src/voip/WebRTCSession.cpp +++ b/src/voip/WebRTCSession.cpp @@ -1114,7 +1114,11 @@ WebRTCSession::haveLocalPiP() const return false; } -bool WebRTCSession::createOffer(webrtc::CallType, uint32_t) { return false; } +bool +WebRTCSession::createOffer(webrtc::CallType, uint32_t) +{ + return false; +} bool WebRTCSession::acceptOffer(const std::string &) |