From 40a3ee6eb2ecde852af2ff6d6ecd21090c119fbb Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 12 Jul 2021 23:02:26 +0200
Subject: [PATCH] Fix verification requests showing up on startup

---
 src/timeline/TimelineViewManager.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index a6fc674e3..b7fd4093d 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -275,6 +275,9 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
           this,
           [this](const mtx::events::RoomEvent<mtx::events::msg::KeyVerificationRequest> &message,
                  TimelineModel *model) {
+                  if (this->isInitialSync_)
+                          return;
+
                   auto event_id = QString::fromStdString(message.event_id);
                   if (!this->dvList.contains(event_id)) {
                           if (auto flow = DeviceVerificationFlow::NewInRoomVerification(
@@ -292,6 +295,9 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
                 &ChatPage::receivedDeviceVerificationRequest,
                 this,
                 [this](const mtx::events::msg::KeyVerificationRequest &msg, std::string sender) {
+                        if (this->isInitialSync_)
+                                return;
+
                         if (!msg.transaction_id)
                                 return;
 
@@ -308,6 +314,9 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
                 &ChatPage::receivedDeviceVerificationStart,
                 this,
                 [this](const mtx::events::msg::KeyVerificationStart &msg, std::string sender) {
+                        if (this->isInitialSync_)
+                                return;
+
                         if (!msg.transaction_id)
                                 return;
 
-- 
GitLab