fixup! feat(crypto) Support Verified and VerificationViolation update…

…s in IdentityStatusChanges streams

crates/matrix-sdk-crypto/src/identities/room_identity_state.rs

@@ -157,7 +157,8 @@ impl<R: RoomIdentityProvider> RoomIdentityState<R> {
                         }
                         MembershipState::Leave | MembershipState::Ban => {
                             // They are leaving the room - treat that as if they are becoming
-                            // Pinned
+                            // Pinned, which means the UI will remove any banner it was displaying
+                            // for them.
 
                             if let Some(update) =
                                 self.update_user_state_to(user_id, IdentityState::Pinned)
@@ -191,6 +192,9 @@ impl<R: RoomIdentityProvider> RoomIdentityState<R> {
         }
     }
 
+    // If the supplied `new_state` represents an actual change, updates our internal
+    // state for this user, and returns the change information we will surface to
+    // the UI.
     fn update_user_state_to(
         &mut self,
         user_id: &UserId,
@@ -200,7 +204,7 @@ impl<R: RoomIdentityProvider> RoomIdentityState<R> {
 
         let old_state = self.known_states.get(user_id);
 
-        let send_update = match (old_state, &new_state) {
+        match (old_state, &new_state) {
             // good -> bad - report so we can add a message
             (Pinned, PinViolation) |
             (Pinned, VerificationViolation) |
@@ -215,23 +219,22 @@ impl<R: RoomIdentityProvider> RoomIdentityState<R> {
 
             // Changed the type of bad - report so can change the message
             (PinViolation, VerificationViolation) |
-            (VerificationViolation, PinViolation) => true,
+            (VerificationViolation, PinViolation) => Some(self.set_state(user_id, new_state)),
 
             // good -> good - don't report - no message needed in either case
             (Pinned, Verified) |
-            (Verified, Pinned) |
+            (Verified, Pinned) => {
+                // The state has changed, so we update it
+                self.set_state(user_id, new_state);
+                // but there is no need to report a change to the UI
+                None
+            }
 
             // State didn't change - don't report - nothing changed
             (Pinned, Pinned) |
             (Verified, Verified) |
             (PinViolation, PinViolation) |
-            (VerificationViolation, VerificationViolation) => false,
-        };
-
-        if send_update {
-            Some(self.set_state(user_id, new_state))
-        } else {
-            None
+            (VerificationViolation, VerificationViolation) => None,
         }
     }