From d845b089e9e9926ad5f244ed50fe9f196c76126c Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Tue, 5 May 2020 16:03:03 +1000 Subject: [PATCH] Fix friend request UI bug --- SignalServiceKit/src/Messages/Interactions/TSMessage.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index 0ca0ac5b9..ced929af4 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -17,6 +17,7 @@ #import #import #import "OWSPrimaryStorage+Loki.h" +#import "TSContactThread.h" NS_ASSUME_NONNULL_BEGIN @@ -459,7 +460,7 @@ static const NSUInteger OWSMessageSchemaVersion = 4; - (BOOL)isFriendRequest { - if (self.thread.isContactFriend) { return NO; } + if (![self.thread isKindOfClass:TSContactThread.class] || self.thread.isContactFriend) { return NO; } return [self.uniqueId isEqual:self.thread.lastInteraction.uniqueId]; }