Merge branch 'charlesmchen/typingIndicatorsBug2' into release/2.32.0

6 years ago · ac012ac59f
parent eda7d6b458 4f0fa23c4f
commit ac012ac59f
1 changed files with 4 additions and 0 deletions
--- a/SignalServiceKit/src/Util/TypingIndicators.swift
+++ b/SignalServiceKit/src/Util/TypingIndicators.swift
@ -159,6 +159,10 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators {
    public func typingRecipientId(forThread thread: TSThread) -> String? {
        AssertIsOnMainThread()

+        guard areTypingIndicatorsEnabled() else {
+            return nil
+        }
+
        var firstRecipientId: String?
        var firstTimestamp: UInt64?