signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix emoji / CoreText crash.

Browse Source
This commit is contained in:
Matthew Chen 2021-08-06 12:26:09 -03:00
parent 0dfffd6e82
commit 4037bcfabb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Signal/src/util/Emoji/EmojiWithSkinTones+String.swift
View File

@ -5,10 +5,8 @@
// This file is generated by EmojiGenerator.swift, do not manually edit it.
extension EmojiWithSkinTones {
init?(rawValue: String, skipSingleEmojiCheck: Bool = false) {
if !skipSingleEmojiCheck {
guard rawValue.isSingleEmoji else { return nil }
}
init?(rawValue: String) {
guard rawValue.isSingleEmoji else { return nil }
if rawValue == "😀" {
self.init(baseEmoji: .grinning, skinTones: nil)
} else if rawValue == "😃" {

2
Signal/src/util/Emoji/EmojiWithSkinTones.swift
View File

@ -68,6 +68,6 @@ extension String {
// * This will reject "lone modifiers".
// * This will reject certain edge cases such as 🌈️.
var isSingleEmojiUsingEmojiWithSkinTones: Bool {
EmojiWithSkinTones(rawValue: self, skipSingleEmojiCheck: true) != nil
EmojiWithSkinTones(rawValue: self) != nil
}
}