Forráskód Böngészése

use correct name for searching, this was wrong before, but not so visible as name and display_name was most times equal in the past. to make the difference more visible, 'name' is renamed to 'editedName'.

B. Petersen 4 éve
szülő
commit
6912c8f299

+ 1 - 1
DcCore/DcCore/DC/Wrapper.swift

@@ -1079,7 +1079,7 @@ public class DcContact {
         return swiftString
     }
 
-    public var name: String {
+    public var editedName: String {
         guard let cString = dc_contact_get_name(contactPointer) else { return "" }
         let swiftString = String(cString: cString)
         dc_str_unref(cString)

+ 2 - 2
deltachat-ios/Controller/EditContactController.swift

@@ -11,13 +11,13 @@ class EditContactController: NewContactController {
         title = String.localized("edit_contact")
 
         let contact = DcContact(id: contactIdForUpdate)
-        nameCell.textField.text = contact.name
+        nameCell.textField.text = contact.editedName
         nameCell.placeholder = contact.displayName
         emailCell.textField.text = contact.email
         emailCell.textField.isEnabled = false
         emailCell.contentView.alpha = 0.3
 
-        model.name = contact.name
+        model.name = contact.editedName
         model.email = contact.email
 
         if contactIsValid() {

+ 4 - 4
deltachat-ios/Extensions/DcContact+Extension.swift

@@ -6,15 +6,15 @@ extension DcContact {
         var nameIndexes = [Int]()
         var emailIndexes = [Int]()
 
-        let contactString = name + email
+        let contactString = displayName + email
         let subsequenceIndexes = contactString.contains(subSequence: text)
 
         if !subsequenceIndexes.isEmpty {
             for index in subsequenceIndexes {
-                if index < name.count {
+                if index < displayName.count {
                     nameIndexes.append(index)
                 } else {
-                    let emailIndex = index - name.count
+                    let emailIndex = index - displayName.count
                     emailIndexes.append(emailIndex)
                 }
             }
@@ -27,7 +27,7 @@ extension DcContact {
     func containsExact(searchText text: String) -> [ContactHighlights] {
         var contactHighlights = [ContactHighlights]()
 
-        let nameString = name + ""
+        let nameString = displayName + ""
         let emailString = email + ""
         if let nameRange = nameString.range(of: text, options: .caseInsensitive) {
             let index: Int = nameString.distance(from: nameString.startIndex, to: nameRange.lowerBound)