Password creator nor correctly supports composed characters.

This mainly enabeld Emoji support
This commit is contained in:
michael starke
2017-05-03 15:44:32 +02:00
parent 201134554e
commit 2edd97c929
5 changed files with 83 additions and 20 deletions

View File

@@ -0,0 +1,39 @@
//
// NSString+MPComposedCharacterLength.m
// MacPass
//
// Created by Michael Starke on 03.05.17.
// Copyright © 2017 HicknHack Software GmbH. All rights reserved.
//
#import "NSString+MPComposedCharacterAdditions.h"
@implementation NSString (MPComposedCharacterAdditions)
- (NSUInteger)composedCharacterLength {
NSUInteger __block actualLength = 0;
[self enumerateSubstringsInRange:NSMakeRange(0, self.length)
options:NSStringEnumerationByComposedCharacterSequences usingBlock:^(NSString * _Nullable substring, NSRange substringRange, NSRange enclosingRange, BOOL * _Nonnull stop) {
actualLength++;
}];
return actualLength;
}
- (NSArray<NSValue *> *)composedCharacterRanges {
__block NSMutableArray *ranges = [[NSMutableArray alloc] initWithCapacity:self.length];
[self enumerateSubstringsInRange:NSMakeRange(0, self.length)
options:NSStringEnumerationByComposedCharacterSequences usingBlock:^(NSString * _Nullable substring, NSRange substringRange, NSRange enclosingRange, BOOL * _Nonnull stop) {
[ranges addObject:[NSValue valueWithRange:substringRange]];
}];
return [ranges copy];
}
- (NSString *)composedCharacterAtIndex:(NSUInteger)index {
NSArray <NSValue *> *ranges = self.composedCharacterRanges;
if(index < ranges.count) {
return [self substringWithRange:ranges[index].rangeValue];
}
return nil;
}
@end