Merge branch 'charlesmchen/tweakMessageMetadata'

Signal/src/ViewControllers/MessageMetadataViewController.swift

@@ -162,6 +162,8 @@ class MessageMetadataViewController: OWSViewController {
         // Recipient(s)
         if let outgoingMessage = message as? TSOutgoingMessage {
 
+            let isGroupThread = message.thread.isGroupThread()
+
             let recipientStatusGroups: [MessageRecipientState] = [
                 .read,
                 .uploading,
@@ -189,8 +191,10 @@ class MessageMetadataViewController: OWSViewController {
                     }
 
                     if groupRows.count < 1 {
-                        groupRows.append(valueRow(name: MessageRecipientStateName(recipientStatusGroup),
-                                                  value:""))
+                        if isGroupThread {
+                            groupRows.append(valueRow(name: MessageRecipientStateName(recipientStatusGroup),
+                                                      value:""))
+                        }
 
                         addDivider()
                     }
@@ -205,6 +209,7 @@ class MessageMetadataViewController: OWSViewController {
                     cell.accessoryView = statusLabel
                     cell.autoSetDimension(.height, toSize:ContactTableViewCell.rowHeight())
                     cell.setContentHuggingLow()
+                    cell.isUserInteractionEnabled = false
                     groupRows.append(cell)
                 }