From bec6d3cd09ecb28ee5672e92b975224ce02fccdb Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 27 Jan 2021 11:27:18 -0300
Subject: [PATCH] Fix accessibility in chat history items.

---
 .../ViewControllers/ConversationView/CV/CVComponent.swift    | 5 ++++-
 .../CV/CVComponents/CVComponentSystemMessage.swift           | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponent.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponent.swift
index 8b162bdcc8..8c16b34b87 100644
--- a/Signal/src/ViewControllers/ConversationView/CV/CVComponent.swift
+++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponent.swift
@@ -230,7 +230,8 @@ extension CVComponentBase: CVNode {
 
     var isTextOnlyMessage: Bool { messageCellType == .textOnlyMessage }
 
-    func accessibilityLabel(description descriptionParam: String?) -> String {
+    func accessibilityLabel(description descriptionParam: String?,
+                            ignoreMissingSenderName: Bool = false) -> String {
         let description = { () -> String in
             if let description = descriptionParam,
                !description.isEmpty {
@@ -241,6 +242,8 @@ extension CVComponentBase: CVNode {
         if let authorName = itemViewState.accessibilityAuthorName,
            !authorName.isEmpty {
             return "\(authorName) \(description)"
+        } else if ignoreMissingSenderName {
+            return description
         } else {
             owsFailDebug("Missing sender name.")
             return description
diff --git a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSystemMessage.swift b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSystemMessage.swift
index 63a8914f0a..8fee29d14a 100644
--- a/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSystemMessage.swift
+++ b/Signal/src/ViewControllers/ConversationView/CV/CVComponents/CVComponentSystemMessage.swift
@@ -99,7 +99,8 @@ public class CVComponentSystemMessage: CVComponentBase, CVRootComponent {
         selectionView.isHiddenInStackView = !isShowingSelectionUI
 
         titleLabelConfig.applyForRendering(label: titleLabel)
-        titleLabel.accessibilityLabel = accessibilityLabel(description: titleLabelConfig.stringValue)
+        titleLabel.accessibilityLabel = accessibilityLabel(description: titleLabelConfig.stringValue,
+                                                           ignoreMissingSenderName: true)
 
         let isReusing = componentView.rootView.superview != nil
         if !isReusing {