Merge branch 'dev' into voice-calls-2

pull/560/head
Ryan Zhao 3 years ago
commit 53f75ff69b

@ -533,9 +533,6 @@ static NSTimeInterval launchStartedAt;
// enables this feature // enables this feature
[self.disappearingMessagesJob startIfNecessary]; [self.disappearingMessagesJob startIfNecessary];
// For non-legacy users, read receipts are on by default.
[self.readReceiptManager setAreReadReceiptsEnabled:YES];
[self startPollerIfNeeded]; [self startPollerIfNeeded];
[self startClosedGroupPoller]; [self startClosedGroupPoller];
[self startOpenGroupPollersIfNeeded]; [self startOpenGroupPollersIfNeeded];

@ -63,7 +63,7 @@ public class TypingIndicatorsImpl : NSObject, TypingIndicators {
} }
private func setup() { private func setup() {
_areTypingIndicatorsEnabled = OWSPrimaryStorage.shared().dbReadConnection.bool(forKey: kDatabaseKey_TypingIndicatorsEnabled, inCollection: kDatabaseCollection, defaultValue: true) _areTypingIndicatorsEnabled = OWSPrimaryStorage.shared().dbReadConnection.bool(forKey: kDatabaseKey_TypingIndicatorsEnabled, inCollection: kDatabaseCollection, defaultValue: false)
} }
// MARK: - // MARK: -

Loading…
Cancel
Save