Make custom list names case sensitive

mullvad · Apr 29, 2024 · cfb2dcb · cfb2dcb
1 parent 0454d16
commit cfb2dcb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ios/MullvadSettings/CustomListRepository.swift b/ios/MullvadSettings/CustomListRepository.swift
@@ -39,7 +39,7 @@ public struct CustomListRepository: CustomListRepositoryProtocol {
     public func save(list: CustomList) throws {
         var lists = fetchAll()
 
-        if let listWithSameName = lists.first(where: { $0.name.caseInsensitiveCompare(list.name) == .orderedSame }),
+        if let listWithSameName = lists.first(where: { $0.name.compare(list.name) == .orderedSame }),
            listWithSameName.id != list.id {
             throw CustomRelayListError.duplicateName
         } else if let index = lists.firstIndex(where: { $0.id == list.id }) {

diff --git a/ios/MullvadVPN/View controllers/SelectLocation/CustomListLocationNodeBuilder.swift b/ios/MullvadVPN/View controllers/SelectLocation/CustomListLocationNodeBuilder.swift
@@ -17,7 +17,7 @@ struct CustomListLocationNodeBuilder {
     var customListLocationNode: CustomListLocationNode {
         let listNode = CustomListLocationNode(
             name: customList.name,
-            code: customList.name.lowercased(),
+            code: customList.name,
             locations: customList.locations,
             isActive: !customList.locations.isEmpty,
             customList: customList

diff --git a/...ullvadVPNTests/MullvadVPN/View controllers/SelectLocation/CustomListRepositoryTests.swift b/...ullvadVPNTests/MullvadVPN/View controllers/SelectLocation/CustomListRepositoryTests.swift
@@ -30,11 +30,13 @@ class CustomListRepositoryTests: XCTestCase {
 
     func testFailedAddingDuplicateCustomList() throws {
         let item1 = CustomList(name: "Netflix", locations: [])
-        let item2 = CustomList(name: "Netflix", locations: [])
+        let item2 = CustomList(name: "netflix", locations: [])
+        let item3 = CustomList(name: "Netflix", locations: [])
 
         try XCTAssertNoThrow(repository.save(list: item1))
+        try XCTAssertNoThrow(repository.save(list: item2))
 
-        XCTAssertThrowsError(try repository.save(list: item2)) { error in
+        XCTAssertThrowsError(try repository.save(list: item3)) { error in
             XCTAssertEqual(error as? CustomRelayListError, CustomRelayListError.duplicateName)
         }
     }