From 33686594e9cb034b823992255f1b3e1656d53885 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 30 Jan 2018 12:49:49 -0500
Subject: [PATCH 1/3] Tweak debug logging.
---
.../ViewControllers/ConversationView/Cells/OWSMessageCell.m | 4 ++--
.../ViewControllers/ConversationView/ConversationViewItem.m | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 64c42b6bf..7569233f7 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -1251,7 +1251,7 @@ const CGFloat OWSMessageCellCornerRadius = 17;
OWSAssert(self.delegate);
if (sender.state != UIGestureRecognizerStateRecognized) {
- DDLogInfo(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.debugDescription);
+ DDLogInfo(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.description);
return;
}
@@ -1277,7 +1277,7 @@ const CGFloat OWSMessageCellCornerRadius = 17;
OWSAssert(self.delegate);
if (sender.state != UIGestureRecognizerStateRecognized) {
- DDLogInfo(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.debugDescription);
+ DDLogInfo(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.description);
return;
}
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index 2c3a8869a..83b6456e5 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -150,7 +150,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
{
switch (self.interaction.interactionType) {
case OWSInteractionType_Unknown:
- OWSFail(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.debugDescription);
+ OWSFail(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.description);
return ConversationViewLayoutAlignment_Center;
case OWSInteractionType_IncomingMessage:
return ConversationViewLayoutAlignment_Incoming;
From 246a56e925afd97079820295967fdcf553a73c97 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 2 Feb 2018 11:04:16 -0500
Subject: [PATCH 2/3] Respond to CR.
---
.../ViewControllers/ConversationView/Cells/OWSMessageCell.m | 4 ++--
.../ViewControllers/ConversationView/ConversationViewItem.m | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 7569233f7..ef0330f6e 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -1251,7 +1251,7 @@ const CGFloat OWSMessageCellCornerRadius = 17;
OWSAssert(self.delegate);
if (sender.state != UIGestureRecognizerStateRecognized) {
- DDLogInfo(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.description);
+ DDLogVerbose(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.debugDescription);
return;
}
@@ -1277,7 +1277,7 @@ const CGFloat OWSMessageCellCornerRadius = 17;
OWSAssert(self.delegate);
if (sender.state != UIGestureRecognizerStateRecognized) {
- DDLogInfo(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.description);
+ DDLogVerbose(@"%@ Ignoring tap on message: %@", self.logTag, self.viewItem.interaction.debugDescription);
return;
}
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index 83b6456e5..cc6c3eb0d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -150,7 +150,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
{
switch (self.interaction.interactionType) {
case OWSInteractionType_Unknown:
- OWSFail(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.description);
+ DDLogVerbose(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.description);
+ OWSFail(@"%@ Unknown interaction type", self.logTag);
return ConversationViewLayoutAlignment_Center;
case OWSInteractionType_IncomingMessage:
return ConversationViewLayoutAlignment_Incoming;
From e3776015bbdc822a1b4052b9d4bce06ff4197f34 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 2 Feb 2018 11:04:36 -0500
Subject: [PATCH 3/3] Respond to CR.
---
.../src/ViewControllers/ConversationView/ConversationViewItem.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index cc6c3eb0d..5ee8b4494 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -150,7 +150,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
{
switch (self.interaction.interactionType) {
case OWSInteractionType_Unknown:
- DDLogVerbose(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.description);
+ DDLogVerbose(@"%@ Unknown interaction type: %@", self.logTag, self.interaction.debugDescription);
OWSFail(@"%@ Unknown interaction type", self.logTag);
return ConversationViewLayoutAlignment_Center;
case OWSInteractionType_IncomingMessage: