CR: Avoid potential transaction nesting

also clean up description method

// FREEBIE

SignalServiceKit/src/Messages/OWSMessageHandler.m

@@ -117,6 +117,8 @@ NSString *envelopeAddress(OWSSignalServiceProtosEnvelope *envelope)
             [description appendString:@"GroupRequest"];
         } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeBlocked) {
             [description appendString:@"BlockedRequest"];
+        } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeConfiguration) {
+            [description appendString:@"ConfigurationRequest"];
         } else {
             // Shouldn't happen
             OWSFail(@"Unknown sync message request type");

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -605,7 +605,8 @@ NS_ASSUME_NONNULL_BEGIN
             // TODO
             DDLogWarn(@"%@ Received unsupported request for block list", self.tag);
         } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeConfiguration) {
-            BOOL areReadReceiptsEnabled = [[OWSReadReceiptManager sharedManager] areReadReceiptsEnabled];
+            BOOL areReadReceiptsEnabled =
+                [[OWSReadReceiptManager sharedManager] areReadReceiptsEnabledWithTransaction:transaction];
             OWSSyncConfigurationMessage *syncConfigurationMessage =
                 [[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:areReadReceiptsEnabled];
             [self.messageSender sendMessage:syncConfigurationMessage

SignalServiceKit/src/Messages/OWSReadReceiptManager.h

@@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class TSOutgoingMessage;
 @class TSThread;
 @class YapDatabaseReadWriteTransaction;
+@class YapDatabaseReadTransaction;
 
 extern NSString *const kIncomingMessageMarkedAsReadNotification;
 
@@ -74,6 +75,7 @@ extern NSString *const kIncomingMessageMarkedAsReadNotification;
 - (void)prepareCachedValues;
 
 - (BOOL)areReadReceiptsEnabled;
+- (BOOL)areReadReceiptsEnabledWithTransaction:(YapDatabaseReadTransaction *)transaction;
 - (void)setAreReadReceiptsEnabled:(BOOL)value;
 
 @end

SignalServiceKit/src/Messages/OWSReadReceiptManager.m

@@ -560,8 +560,22 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
     // We don't need to worry about races around this cached value.
     if (!self.areReadReceiptsEnabledCached) {
         // Default to NO.
-        self.areReadReceiptsEnabledCached = @([self.dbConnection boolForKey:OWSReadReceiptManagerAreReadReceiptsEnabled
+        self.areReadReceiptsEnabledCached =
-                                                               inCollection:OWSReadReceiptManagerCollection]);
+            @([self.dbConnection boolForKey:OWSReadReceiptManagerAreReadReceiptsEnabled
+                               inCollection:OWSReadReceiptManagerAreReadReceiptsEnabled]);
+    }
+
+    return [self.areReadReceiptsEnabledCached boolValue];
+}
+
+- (BOOL)areReadReceiptsEnabledWithTransaction:(YapDatabaseReadTransaction *)transaction
+{
+    if (!self.areReadReceiptsEnabledCached) {
+        [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+            // Default to NO.
+            self.areReadReceiptsEnabledCached = [transaction objectForKey:OWSReadReceiptManagerAreReadReceiptsEnabled
+                                                             inCollection:OWSReadReceiptManagerAreReadReceiptsEnabled];
+        }];
     }
 
     return [self.areReadReceiptsEnabledCached boolValue];