From 6e457e43ca2ed13639f27861fe65deeed06c2bb7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 4 Dec 2018 22:09:23 -0500 Subject: [PATCH 1/2] Clear typing indicators when they are disabled. --- .../ViewControllers/ConversationView/ConversationViewModel.m | 2 +- Signal/src/ViewControllers/HomeView/HomeViewCell.m | 2 +- SignalServiceKit/src/Util/TypingIndicators.swift | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 574504950..2327d4a6a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -1352,7 +1352,7 @@ static const int kYapDatabaseRangeMinLength = 0; OWSAssertDebug([notification.object isKindOfClass:[NSString class]]); OWSAssertDebug(self.thread); - if (![notification.object isEqual:self.thread.uniqueId]) { + if (notification.object && ![notification.object isEqual:self.thread.uniqueId]) { return; } diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m index 2658d5d10..63e838c81 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m @@ -548,7 +548,7 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug([notification.object isKindOfClass:[NSString class]]); OWSAssertDebug(self.thread); - if (![notification.object isEqual:self.thread.threadRecord.uniqueId]) { + if (notification.object && ![notification.object isEqual:self.thread.threadRecord.uniqueId]) { return; } diff --git a/SignalServiceKit/src/Util/TypingIndicators.swift b/SignalServiceKit/src/Util/TypingIndicators.swift index be57a61e3..97b721391 100644 --- a/SignalServiceKit/src/Util/TypingIndicators.swift +++ b/SignalServiceKit/src/Util/TypingIndicators.swift @@ -88,6 +88,8 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators { primaryStorage.dbReadWriteConnection.setBool(value, forKey: kDatabaseKey_TypingIndicatorsEnabled, inCollection: kDatabaseCollection) syncManager.sendConfigurationSyncMessage() + + NotificationCenter.default.postNotificationNameAsync(TypingIndicatorsImpl.typingIndicatorStateDidChange, object: nil) } @objc @@ -132,6 +134,7 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators { @objc public func didReceiveTypingStartedMessage(inThread thread: TSThread, recipientId: String, deviceId: UInt) { AssertIsOnMainThread() + Logger.info("") let incomingIndicators = ensureIncomingIndicators(forThread: thread, recipientId: recipientId, deviceId: deviceId) incomingIndicators.didReceiveTypingStartedMessage() } @@ -139,6 +142,7 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators { @objc public func didReceiveTypingStoppedMessage(inThread thread: TSThread, recipientId: String, deviceId: UInt) { AssertIsOnMainThread() + Logger.info("") let incomingIndicators = ensureIncomingIndicators(forThread: thread, recipientId: recipientId, deviceId: deviceId) incomingIndicators.didReceiveTypingStoppedMessage() } @@ -146,6 +150,7 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators { @objc public func didReceiveIncomingMessage(inThread thread: TSThread, recipientId: String, deviceId: UInt) { AssertIsOnMainThread() + Logger.info("") let incomingIndicators = ensureIncomingIndicators(forThread: thread, recipientId: recipientId, deviceId: deviceId) incomingIndicators.didReceiveIncomingMessage() } From e5f99b9d64449198365366c728dd3a27b44b62db Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 5 Dec 2018 14:06:29 -0500 Subject: [PATCH 2/2] "Bump build to 2.32.0.20." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 3f6ee4e90..ffe6f6419 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 2.32.0.19 + 2.32.0.20 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 83ed2f7dd..38116d48b 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.32.0 CFBundleVersion - 2.32.0.19 + 2.32.0.20 ITSAppUsesNonExemptEncryption NSAppTransportSecurity