KeyVerificationEvent; KeyVerificationSession::handleEvent()

Key verification events gain their own base type and
KeyVerificationSession gets a single point of entry for all kinds of
incoming events. This allows to drop a pile of `incoming*` signals in
Connection and a stack of options inside switchOnType in
processIfVerification(). KVS::handleEvent() also makes (some) allowed
state transitions a bit clearer.

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/connection.h b/lib/connection.h
index 79c23c9a..75faf370 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -864,15 +864,10 @@ Q_SIGNALS:
     void devicesListLoaded();
 
 #ifdef Quotient_E2EE_ENABLED
-    void incomingKeyVerificationReady(const KeyVerificationReadyEvent& event);
-    void incomingKeyVerificationStart(const KeyVerificationStartEvent& event);
-    void incomingKeyVerificationAccept(const KeyVerificationAcceptEvent& event);
-    void incomingKeyVerificationKey(const KeyVerificationKeyEvent& event);
-    void incomingKeyVerificationMac(const KeyVerificationMacEvent& event);
-    void incomingKeyVerificationDone(const KeyVerificationDoneEvent& event);
-    void incomingKeyVerificationCancel(const KeyVerificationCancelEvent& event);
-
     void newKeyVerificationSession(KeyVerificationSession* session);
+    void keyVerificationStateChanged(
+        const KeyVerificationSession* session,
+        Quotient::KeyVerificationSession::State state);
     void sessionVerified(const QString& userId, const QString& deviceId);
 #endif