From 39177fe448fddbe7d7eac48f3b9d8e55097b7f9d Mon Sep 17 00:00:00 2001 From: Mikunj Date: Thu, 22 Aug 2019 15:54:38 +1000 Subject: [PATCH] Ensure we have a valid token length. Disable typing indicator messages on group threads. --- SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift | 2 +- SignalServiceKit/src/Util/TypingIndicators.swift | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift b/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift index 9c2acd0e3..5de157785 100644 --- a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift @@ -55,7 +55,7 @@ public final class LokiGroupChatAPI : NSObject { } internal static func getToken() -> Promise { - guard let token = storage.dbReadConnection.string(forKey: serverURL, inCollection: tokenCollection) else { + guard let token = storage.dbReadConnection.string(forKey: serverURL, inCollection: tokenCollection), token.count > 0 else { return fetchToken().then { submitToken($0) }.map { token -> String in storage.dbReadWriteConnection.setObject(token, forKey: serverURL, inCollection: tokenCollection) return token diff --git a/SignalServiceKit/src/Util/TypingIndicators.swift b/SignalServiceKit/src/Util/TypingIndicators.swift index f148a7555..67f49cc7f 100644 --- a/SignalServiceKit/src/Util/TypingIndicators.swift +++ b/SignalServiceKit/src/Util/TypingIndicators.swift @@ -322,6 +322,11 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators { guard delegate.areTypingIndicatorsEnabled() else { return } + + // Disable typing indicators on public group chats + guard !thread.isGroupThread() else { + return + } let message = TypingIndicatorMessage(thread: thread, action: action) messageSender.sendPromise(message: message).retainUntilComplete()