Revert "Implement workaround for Android group ID compatibility bug"

This reverts commit f83058b34b.
pull/247/head
nielsandriesse 5 years ago
parent c2c8d68f5d
commit 3ecd7dda5d

@ -1,6 +1,4 @@
#import "LKGroupUtilities.h" #import "LKGroupUtilities.h"
#import "NSData+OWS.h"
#import <SessionServiceKit/SessionServiceKit-Swift.h>
@implementation LKGroupUtilities @implementation LKGroupUtilities
@ -66,12 +64,8 @@
+(NSData *)getDecodedGroupIDAsData:(NSData *)groupID +(NSData *)getDecodedGroupIDAsData:(NSData *)groupID
{ {
// FIXME: This needs to be cleaned up. A lot.
OWSAssertDebug(groupID.length > 0); OWSAssertDebug(groupID.length > 0);
NSString *encodedGroupID = [[NSString alloc] initWithData:groupID encoding:NSUTF8StringEncoding]; 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 *decodedGroupID = [encodedGroupID componentsSeparatedByString:@"!"][0]; NSString *decodedGroupID = [encodedGroupID componentsSeparatedByString:@"!"][0];
if ([encodedGroupID componentsSeparatedByString:@"!"].count > 1) { if ([encodedGroupID componentsSeparatedByString:@"!"].count > 1) {
decodedGroupID = [encodedGroupID componentsSeparatedByString:@"!"][1]; decodedGroupID = [encodedGroupID componentsSeparatedByString:@"!"][1];

Loading…
Cancel
Save