ソースを参照

subsequence optional for easier use

nayooti 5 年 前
コミット
57f1bbdd93
1 ファイル変更7 行追加4 行削除
  1. 7 4
      deltachat-ios/Extensions/String+Extension.swift

+ 7 - 4
deltachat-ios/Extensions/String+Extension.swift

@@ -13,15 +13,18 @@ extension String {
         return !trimmingCharacters(in: [" "]).isEmpty
         return !trimmingCharacters(in: [" "]).isEmpty
     }
     }
 
 
-    func containsExact(subSequence: String) -> [Int] {
-        if subSequence.count > count {
+    func containsExact(subSequence: String?) -> [Int] {
+        guard let searchText = subSequence else {
+            return []
+        }
+        if searchText.count > count {
             return []
             return []
         }
         }
 
 
-        if let range = range(of: subSequence, options: .caseInsensitive) {
+        if let range = range(of: searchText, options: .caseInsensitive) {
             let index: Int = distance(from: startIndex, to: range.lowerBound)
             let index: Int = distance(from: startIndex, to: range.lowerBound)
             var indexes: [Int] = []
             var indexes: [Int] = []
-            for i in index..<(index + subSequence.count) {
+            for i in index..<(index + searchText.count) {
                 indexes.append(i)
                 indexes.append(i)
             }
             }
             return indexes
             return indexes