Fix #992: Update empty bookmark title from desktop sync. (#993)

brave · Mar 22, 2019 · e628bb6 · e628bb6
1 parent 60d264f
commit e628bb6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Data/models/Bookmark.swift b/Data/models/Bookmark.swift
@@ -121,6 +121,9 @@ public final class Bookmark: NSManagedObject, WebsitePresentable, Syncable, CRUD
     // MARK: Update
 
     public func update(customTitle: String?, url: String?) {
+        // Title can't be empty, except when coming from Sync
+        let isTitleEmpty = customTitle?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true
+        if customTitle == nil || isTitleEmpty { return }
         updateInternal(customTitle: customTitle, url: url)
     }
 
@@ -313,10 +316,8 @@ extension Bookmark {
                 return
             }
 
-            if let ct = customTitle, !ct.isEmpty {
-                bookmarkToUpdate.customTitle = ct
-                bookmarkToUpdate.title = ct
-            }
+            bookmarkToUpdate.customTitle = customTitle
+            bookmarkToUpdate.title = customTitle
 
             if let u = url, !u.isEmpty {
                 bookmarkToUpdate.url = url

diff --git a/DataTests/FavoriteTests.swift b/DataTests/FavoriteTests.swift
@@ -44,14 +44,15 @@ class FavoriteTests: CoreDataTestCase {
     func testEditFavoriteURL() {
         let url = "http://brave.com"
         let newUrl = "http://updated.example.com"
+        let newTitle = "newtitle"
 
         let object = createAndWait(url: URL(string: url), title: "title")
 
         XCTAssertEqual(object.displayTitle, "title")
         XCTAssertEqual(object.url, url)
 
         backgroundSaveAndWaitForExpectation {
-            object.update(customTitle: nil, url: newUrl)
+            object.update(customTitle: newTitle, url: newUrl)
         }
         // Make sure only one record was added to DB
         XCTAssertEqual(try! DataController.viewContext.count(for: fetchRequest), 1)