From 3ecd7dda5d10318d7e92c800617eee5c7ad73627 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Mon, 17 Aug 2020 13:59:23 +1000 Subject: [PATCH] Revert "Implement workaround for Android group ID compatibility bug" This reverts commit f83058b34b89d01f9e75ff75d726c4e2817ef619. --- .../src/Loki/Protocol/Utilities/LKGroupUtilities.m | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/SignalServiceKit/src/Loki/Protocol/Utilities/LKGroupUtilities.m b/SignalServiceKit/src/Loki/Protocol/Utilities/LKGroupUtilities.m index 2cc376243..38cdca4c6 100644 --- a/SignalServiceKit/src/Loki/Protocol/Utilities/LKGroupUtilities.m +++ b/SignalServiceKit/src/Loki/Protocol/Utilities/LKGroupUtilities.m @@ -1,6 +1,4 @@ #import "LKGroupUtilities.h" -#import "NSData+OWS.h" -#import @implementation LKGroupUtilities @@ -66,12 +64,8 @@ +(NSData *)getDecodedGroupIDAsData:(NSData *)groupID { - // FIXME: This needs to be cleaned up. A lot. OWSAssertDebug(groupID.length > 0); - NSString *encodedGroupID = [[NSString alloc] initWithData:groupID encoding:NSUTF8StringEncoding]; - if (encodedGroupID == nil && [ECKeyPair isValidHexEncodedPublicKeyWithCandidate:[groupID hexadecimalString]]) { - return groupID; // Workaround to make things compatible with Android - } + NSString *encodedGroupID = [[NSString alloc]initWithData:groupID encoding:NSUTF8StringEncoding]; NSString *decodedGroupID = [encodedGroupID componentsSeparatedByString:@"!"][0]; if ([encodedGroupID componentsSeparatedByString:@"!"].count > 1) { decodedGroupID = [encodedGroupID componentsSeparatedByString:@"!"][1];