From c2f87c738a7d0971270a028d17cf18e442763584 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 24 Sep 2018 15:43:58 -0600
Subject: [PATCH] trivial replace of timestampForSorting -> sortId in some
logging
---
SignalMessaging/utils/ThreadUtil.m | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m
index 74d0117c8..8835a8785 100644
--- a/SignalMessaging/utils/ThreadUtil.m
+++ b/SignalMessaging/utils/ThreadUtil.m
@@ -482,10 +482,8 @@ NS_ASSUME_NONNULL_BEGIN
}
if (existingContactOffers && !shouldHaveContactOffers) {
- // MJK FIXME - use sortId
- OWSLogInfo(@"Removing contact offers: %@ (%llu)",
- existingContactOffers.uniqueId,
- existingContactOffers.timestampForLegacySorting);
+ OWSLogInfo(
+ @"Removing contact offers: %@ (%llu)", existingContactOffers.uniqueId, existingContactOffers.sortId);
[existingContactOffers removeWithTransaction:transaction];
} else if (shouldHaveContactOffers) {
if (existingContactOffers) {
@@ -493,10 +491,9 @@ NS_ASSUME_NONNULL_BEGIN
if (existingContactOffers.hasBlockOffer != shouldHaveBlockOffer
|| existingContactOffers.hasAddToContactsOffer != shouldHaveAddToContactsOffer
|| existingContactOffers.hasAddToProfileWhitelistOffer != shouldHaveAddToProfileWhitelistOffer) {
- // MJK FIXME - use sortId
OWSLogInfo(@"Updating stale contact offers: %@ (%llu)",
existingContactOffers.uniqueId,
- existingContactOffers.timestampForLegacySorting);
+ existingContactOffers.sortId);
[existingContactOffers updateHasBlockOffer:shouldHaveBlockOffer
hasAddToContactsOffer:shouldHaveAddToContactsOffer
@@ -516,10 +513,7 @@ NS_ASSUME_NONNULL_BEGIN
recipientId:recipientId];
[offersMessage saveWithTransaction:transaction];
- // MJK FIXME - use sortId
- OWSLogInfo(@"Creating contact offers: %@ (%llu)",
- offersMessage.uniqueId,
- offersMessage.timestampForLegacySorting);
+ OWSLogInfo(@"Creating contact offers: %@ (%llu)", offersMessage.uniqueId, offersMessage.sortId);
}
}