Merge branch 'dev' into voice-calls-2

3 years ago · 53f75ff69b
parent e62877baca 7a22c9d329
commit 53f75ff69b
2 changed files with 1 additions and 4 deletions
--- a/Session/Meta/AppDelegate.m
+++ b/Session/Meta/AppDelegate.m
@ -533,9 +533,6 @@ static NSTimeInterval launchStartedAt;
        // enables this feature
        [self.disappearingMessagesJob startIfNecessary];

-        // For non-legacy users, read receipts are on by default.
-        [self.readReceiptManager setAreReadReceiptsEnabled:YES];
-
        [self startPollerIfNeeded];
        [self startClosedGroupPoller];
        [self startOpenGroupPollersIfNeeded];
--- a/Indicators/TypingIndicators.swift
+++ b/Indicators/TypingIndicators.swift
@ -63,7 +63,7 @@ public class TypingIndicatorsImpl : NSObject, TypingIndicators {
    }

    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: -