Allow deleting custom lists

Author: Jon Petersson

ios/MullvadSettings/CustomListRepository.swift

@@ -18,7 +18,7 @@ public enum CustomRelayListError: LocalizedError, Equatable {
         switch self {
         case .duplicateName:
             NSLocalizedString(
-                "DUPLICATE_CUSTOM_LIST_ERROR",
+                "DUPLICATE_CUSTOM_LISTS_ERROR",
                 tableName: "CustomListRepository",
                 value: "Name is already taken.",
                 comment: ""

ios/MullvadVPN/Coordinators/CustomLists/AddCustomListCoordinator.swift

@@ -42,14 +42,14 @@ class AddCustomListCoordinator: Coordinator, Presentable, Presenting {
         controller.delegate = self
 
         controller.navigationItem.title = NSLocalizedString(
-            "CUSTOM_LIST_NAVIGATION_EDIT_TITLE",
+            "CUSTOM_LISTS_NAVIGATION_EDIT_TITLE",
             tableName: "CustomLists",
             value: "New custom list",
             comment: ""
         )
 
         controller.saveBarButton.title = NSLocalizedString(
-            "CUSTOM_LIST_NAVIGATION_CREATE_BUTTON",
+            "CUSTOM_LISTS_NAVIGATION_CREATE_BUTTON",
             tableName: "CustomLists",
             value: "Create",
             comment: ""

ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift

@@ -154,30 +154,44 @@ class CustomListViewController: UIViewController {
         } catch {
             validationErrors.insert(.name)
             dataSourceConfiguration?.set(validationErrors: validationErrors)
+            showSaveErrorAlert()
         }
     }
 
     private func onDelete() {
-        // TODO: Show error dialog.
-        delegate?.customListDidDelete()
+        showDeleteAlert()
     }
 
-    private func showSaveErrorAlert() {
+    private func showDeleteAlert() {
         let presentation = AlertPresentation(
-            id: "api-custom-lists-save-list-alert",
+            id: "api-custom-lists-delete-list-alert",
             icon: .alert,
             message: NSLocalizedString(
-                "CUSTOM_LISTS_SAVE_ERROR_PROMPT",
+                "CUSTOM_LISTS_DELETE_PROMPT",
                 tableName: "APIAccess",
-                value: "List name is already taken.",
+                value: "Delete \(subject.value.name)?",
                 comment: ""
             ),
             buttons: [
                 AlertAction(
                     title: NSLocalizedString(
-                        "CUSTOM_LISTS_OK_BUTTON",
+                        "CUSTOM_LISTS_DELETE_BUTTON",
                         tableName: "APIAccess",
-                        value: "Got it!",
+                        value: "Delete",
+                        comment: ""
+                    ),
+                    style: .destructive,
+                    handler: {
+                        self.interactor.deleteCustomList(id: self.subject.value.id)
+                        self.dismiss(animated: true)
+                        self.delegate?.customListDidDelete()
+                    }
+                ),
+                AlertAction(
+                    title: NSLocalizedString(
+                        "CUSTOM_LISTS_CANCEL_BUTTON",
+                        tableName: "APIAccess",
+                        value: "Cancel",
                         comment: ""
                     ),
                     style: .default

ios/MullvadVPN/Coordinators/SelectLocationCoordinator.swift

@@ -7,6 +7,7 @@
 //
 
 import MullvadREST
+import MullvadSettings
 import MullvadTypes
 import Routing
 import UIKit
@@ -73,9 +74,17 @@ class SelectLocationCoordinator: Coordinator, Presentable, Presenting, RelayCach
         selectLocationViewController.navigateToFilter = { [weak self] in
             guard let self else { return }
 
-            let coordinator = makeRelayFilterCoordinator(forModalPresentation: true)
+//            let coordinator = makeRelayFilterCoordinator(forModalPresentation: true)
+            let coordinator = AddCustomListCoordinator(
+                navigationController: CustomNavigationController(),
+                customListInteractor: CustomListInteractor(repository: CustomListRepository())
+            )
             coordinator.start()
 
+            coordinator.didFinish = {
+                coordinator.dismiss(animated: true)
+            }
+
             presentChild(coordinator, animated: true)
         }
 

ios/MullvadVPN/Coordinators/Settings/APIAccess/Edit/EditAccessMethodViewController.swift

@@ -333,7 +333,7 @@ class EditAccessMethodViewController: UITableViewController {
             id: "api-access-methods-delete-method-alert",
             icon: .alert,
             message: NSLocalizedString(
-                "METHOD_SETTINGS_SAVE_PROMPT",
+                "METHOD_SETTINGS_DELETE_PROMPT",
                 tableName: "APIAccess",
                 value: "Delete \(methodName)?",
                 comment: ""

ios/MullvadVPNTests/CustomListRepositoryTests.swift

@@ -31,7 +31,7 @@ class CustomListRepositoryTests: XCTestCase {
     func testFailedAddingDuplicateCustomList() throws {
         let name = "Netflix"
         let item = try XCTUnwrap(repository.create(name, locations: []))
-
+        
         XCTAssertThrowsError(try repository.create(item.name, locations: [])) { error in
             XCTAssertEqual(error as? CustomRelayListError, CustomRelayListError.duplicateName)
         }