From 1ef9ba06597dfa41e4e1bb208ad9e99cff314da2 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 7 Jun 2017 17:51:57 -0400
Subject: [PATCH] Clea up usage of fail macro.

// FREEBIE
---
 Signal/src/Models/OWSMessagesBubblesSizeCalculator.m | 2 +-
 Signal/src/network/PushManager.m                     | 3 +--
 Signal/src/util/ThreadUtil.m                         | 2 +-
 Signal/src/views/OWSSystemMessageCell.m              | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m b/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
index e6840bd3f..8bd9e2931 100644
--- a/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
+++ b/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
@@ -71,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN
             case TSOutgoingMessageAdapter:
                 break;
             default:
-                OWSFail(@"---- Unknown sizing interaction: %@", [((TSMessageAdapter *)messageData).interaction class]);
+                OWSFail(@"Unknown sizing interaction: %@", [((TSMessageAdapter *)messageData).interaction class]);
                 break;
         }
     } else if ([messageData isKindOfClass:[OWSCall class]]) {
diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m
index cdcbfb818..7254b0caa 100644
--- a/Signal/src/network/PushManager.m
+++ b/Signal/src/network/PushManager.m
@@ -214,8 +214,7 @@ NSString *const Signal_Message_MarkAsRead_Identifier = @"Signal_Message_MarkAsRe
         [Environment messageThreadId:threadId];
         completionHandler();
     } else {
-        DDLogError(@"%@ Unhandled action with identifier: %@", self.tag, identifier);
-        OWSFail(@"Unhandled action");
+        OWSFail(@"%@ Unhandled action with identifier: %@", self.tag, identifier);
         NSString *threadId = notification.userInfo[Signal_Thread_UserInfo_Key];
         [Environment messageThreadId:threadId];
         completionHandler();
diff --git a/Signal/src/util/ThreadUtil.m b/Signal/src/util/ThreadUtil.m
index 31d1fe507..cf2fa1f52 100644
--- a/Signal/src/util/ThreadUtil.m
+++ b/Signal/src/util/ThreadUtil.m
@@ -208,7 +208,7 @@ NS_ASSUME_NONNULL_BEGIN
                               BOOL *stop) {
 
                               if (![object isKindOfClass:[TSInteraction class]]) {
-                                  OWSFail(@"Expected a TSInteraction");
+                                  OWSFail(@"Expected a TSInteraction: %@", [object class]);
                                   return;
                               }
 
diff --git a/Signal/src/views/OWSSystemMessageCell.m b/Signal/src/views/OWSSystemMessageCell.m
index 24f46e4f0..21916ee6d 100644
--- a/Signal/src/views/OWSSystemMessageCell.m
+++ b/Signal/src/views/OWSSystemMessageCell.m
@@ -138,7 +138,7 @@
     } else if ([interaction isKindOfClass:[TSCall class]]) {
         result = [UIImage imageNamed:@"system_message_call"];
     } else {
-        OWSFail(@"Unknown interaction type");
+        OWSFail(@"Unknown interaction type: %@", [interaction class]);
         return nil;
     }
     OWSAssert(result);
@@ -156,7 +156,7 @@
     } else if ([interaction isKindOfClass:[TSCall class]]) {
         return interaction.description;
     } else {
-        OWSFail(@"Unknown interaction type");
+        OWSFail(@"Unknown interaction type: %@", [interaction class]);
         return nil;
     }
 }