Clea up usage of fail macro.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 4d370130b2
commit 1ef9ba0659

@ -71,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN
case TSOutgoingMessageAdapter: case TSOutgoingMessageAdapter:
break; break;
default: default:
OWSFail(@"---- Unknown sizing interaction: %@", [((TSMessageAdapter *)messageData).interaction class]); OWSFail(@"Unknown sizing interaction: %@", [((TSMessageAdapter *)messageData).interaction class]);
break; break;
} }
} else if ([messageData isKindOfClass:[OWSCall class]]) { } else if ([messageData isKindOfClass:[OWSCall class]]) {

@ -214,8 +214,7 @@ NSString *const Signal_Message_MarkAsRead_Identifier = @"Signal_Message_MarkAsRe
[Environment messageThreadId:threadId]; [Environment messageThreadId:threadId];
completionHandler(); completionHandler();
} else { } else {
DDLogError(@"%@ Unhandled action with identifier: %@", self.tag, identifier); OWSFail(@"%@ Unhandled action with identifier: %@", self.tag, identifier);
OWSFail(@"Unhandled action");
NSString *threadId = notification.userInfo[Signal_Thread_UserInfo_Key]; NSString *threadId = notification.userInfo[Signal_Thread_UserInfo_Key];
[Environment messageThreadId:threadId]; [Environment messageThreadId:threadId];
completionHandler(); completionHandler();

@ -208,7 +208,7 @@ NS_ASSUME_NONNULL_BEGIN
BOOL *stop) { BOOL *stop) {
if (![object isKindOfClass:[TSInteraction class]]) { if (![object isKindOfClass:[TSInteraction class]]) {
OWSFail(@"Expected a TSInteraction"); OWSFail(@"Expected a TSInteraction: %@", [object class]);
return; return;
} }

@ -138,7 +138,7 @@
} else if ([interaction isKindOfClass:[TSCall class]]) { } else if ([interaction isKindOfClass:[TSCall class]]) {
result = [UIImage imageNamed:@"system_message_call"]; result = [UIImage imageNamed:@"system_message_call"];
} else { } else {
OWSFail(@"Unknown interaction type"); OWSFail(@"Unknown interaction type: %@", [interaction class]);
return nil; return nil;
} }
OWSAssert(result); OWSAssert(result);
@ -156,7 +156,7 @@
} else if ([interaction isKindOfClass:[TSCall class]]) { } else if ([interaction isKindOfClass:[TSCall class]]) {
return interaction.description; return interaction.description;
} else { } else {
OWSFail(@"Unknown interaction type"); OWSFail(@"Unknown interaction type: %@", [interaction class]);
return nil; return nil;
} }
} }

Loading…
Cancel
Save