From 43dc362fc7db828c857c9517f1dadff1e5b46af8 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 27 Sep 2018 11:18:58 -0400
Subject: [PATCH] Fix secondary color within message bubbles.

---
 SignalMessaging/utils/ConversationStyle.swift | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift
index bc7cf6d49..5884b2f07 100644
--- a/SignalMessaging/utils/ConversationStyle.swift
+++ b/SignalMessaging/utils/ConversationStyle.swift
@@ -197,19 +197,10 @@ public class ConversationStyle: NSObject {
         }
     }
 
+    // Note that the exception for outgoing text only applies
+    // to secondary text within bubbles.
     @objc
     public func bubbleSecondaryTextColor(isIncoming: Bool) -> UIColor {
-        if Theme.isDarkThemeEnabled {
-            // Incoming, dark.
-            return UIColor.ows_gray25
-        } else {
-            // Incoming, light.
-            return UIColor.ows_gray60
-        }
-    }
-
-    @objc
-    public func footerTextColor(isIncoming: Bool) -> UIColor {
         if !isIncoming {
             // All Outgoing
             return UIColor.ows_white.withAlphaComponent(0.8)