clarify naming

// FREEBIE

SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m

@@ -118,7 +118,7 @@ NS_ASSUME_NONNULL_BEGIN
     return OWSInteractionType_IncomingMessage;
 }
 
-- (BOOL)shouldStartExpireTimer:(YapDatabaseReadTransaction *)transaction
+- (BOOL)shouldStartExpireTimerWithTransaction:(YapDatabaseReadTransaction *)transaction
 {
     for (NSString *attachmentId in self.attachmentIds) {
         TSAttachment *_Nullable attachment =

SignalServiceKit/src/Messages/Interactions/TSMessage.h

@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setQuotedMessageThumbnailAttachmentStream:(TSAttachmentStream *)attachmentStream;
 
 - (BOOL)shouldStartExpireTimer;
-- (BOOL)shouldStartExpireTimer:(YapDatabaseReadTransaction *)transaction;
+- (BOOL)shouldStartExpireTimerWithTransaction:(YapDatabaseReadTransaction *)transaction;
 
 #pragma mark - Update With... Methods
 

SignalServiceKit/src/Messages/Interactions/TSMessage.m

@@ -167,12 +167,12 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 {
     __block BOOL result;
     [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
-        result = [self shouldStartExpireTimer:transaction];
+        result = [self shouldStartExpireTimerWithTransaction:transaction];
     }];
     return result;
 }
 
-- (BOOL)shouldStartExpireTimer:(YapDatabaseReadTransaction *)transaction
+- (BOOL)shouldStartExpireTimerWithTransaction:(YapDatabaseReadTransaction *)transaction
 {
     return self.isExpiringMessage;
 }

SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m

@@ -391,7 +391,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
     return NO;
 }
 
-- (BOOL)shouldStartExpireTimer:(YapDatabaseReadTransaction *)transaction
+- (BOOL)shouldStartExpireTimerWithTransaction:(YapDatabaseReadTransaction *)transaction
 {
     // It's not clear if we should wait until _all_ recipients have reached "sent or later"
     // (which could never occur if one group member is unregistered) or only wait until

SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m

@@ -177,7 +177,7 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess
             }
             TSMessage *message = (TSMessage *)object;
 
-            if (![message shouldStartExpireTimer:transaction]) {
+            if (![message shouldStartExpireTimerWithTransaction:transaction]) {
                 return;
             }
 

SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m

@@ -373,7 +373,7 @@ void AssertIsOnDisappearingMessagesQueue()
         // exception is if we're in close proximity to the disappearanceTimer, in which case a race condition
         // is inevitable.
         if (!recentlyScheduledDisappearanceTimer && deletedCount > 0) {
-            OWSProdLogAndFail(@"%@ unexpectedly deleted disappearing messages via fallback timer.");
+            OWSProdLogAndFail(@"%@ unexpectedly deleted disappearing messages via fallback timer.", self.logTag);
         }
     });
 }