Merge pull request #527 from NordicSemiconductor/message-callbacks-async

Asynchronous message sending - with `async`-first approach

Example/Podfile

@@ -1,6 +1,6 @@
 use_frameworks!
 
-platform :ios, '12.0'
+platform :ios, '13.0'
 
 target 'nRF Mesh' do
   pod 'nRFMeshProvision', :path => '../'

Example/Source/Utils/UIViewController+Alert.swift

@@ -59,16 +59,17 @@ extension UIViewController {
     /// - parameters:
     ///   - title:   The alert title.
     ///   - message: The message below the title.
+    ///   - onCancel:The Cancel button handler.   
     ///   - handler: The Confirm button handler.
-    func confirm(title: String?, message: String?, handler: ((UIAlertAction) -> Void)? = nil) {
+    func confirm(title: String?, message: String?, onCancel: ((UIAlertAction) -> Void)? = nil, handler: ((UIAlertAction) -> Void)? = nil) {
         // TODO: Should only iPad be handled differently? How about carPlay or Apple TV?
         let ipad = UIDevice.current.userInterfaceIdiom == .pad
         let style: UIAlertController.Style = ipad ? .alert : .actionSheet
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
             let alert = UIAlertController(title: title, message: message, preferredStyle: style)
             alert.addAction(UIAlertAction(title: "Confirm", style: .destructive, handler: handler))
-            alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+            alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: onCancel))
             self.present(alert, animated: true)
         }
     }

Example/Source/View Controllers/Groups/GroupsViewController.swift

@@ -103,10 +103,14 @@ class GroupsViewController: UITableViewController, Editable, UISearchBarDelegate
         return group.isUsed ? .none : .delete
     }
 
-    override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         let group = filteredGroups[indexPath.row]
         if group.isUsed {
-            return [UITableViewRowAction(style: .normal, title: "In Use", handler: { _,_ in })]
+            return UISwipeActionsConfiguration(actions: [
+                UIContextualAction(style: .normal, title: "In Use", handler: { _, _, completionHandler in
+                    completionHandler(false)
+                })
+            ])
         }
         return nil
     }

Example/Source/View Controllers/Network/Configuration/ModelViewController.swift

@@ -506,13 +506,14 @@ class ModelViewController: ProgressViewController {
         }
     }
 
-    override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         let section = sections[indexPath.section]
         switch section {
         case .appKeyBinding:
-            return [UITableViewRowAction(style: .destructive, title: "Unbind", handler: { _, indexPath in
+            let action = UIContextualAction(style: .destructive, title: "Unbind") { _, _, completionHandler in
                 guard indexPath.row < self.model.boundApplicationKeys.count else {
-                        return
+                    completionHandler(false)
+                    return
                 }
                 let applicationKey = self.model.boundApplicationKeys[indexPath.row]
 
@@ -553,13 +554,18 @@ class ModelViewController: ProgressViewController {
                             message += "\nThe publication will be cancelled automatically."
                         }
                     }
-                    self.confirm(title: "Key in use", message: message, handler: { _ in
+                    self.confirm(title: "Key in use", message: message) { _ in
+                        completionHandler(false)
+                    } handler: { _ in
                         self.unbindApplicationKey(applicationKey)
-                    })
+                        completionHandler(true)
+                    }
                 } else {
                     self.unbindApplicationKey(applicationKey)
+                    completionHandler(true)
                 }
-            })]
+            }
+            return UISwipeActionsConfiguration(actions: [action])
         default:
             return nil
         }

Example/Source/View Controllers/Network/Configuration/NodeAppKeysViewController.swift

@@ -120,12 +120,6 @@ class NodeAppKeysViewController: ProgressViewController, Editable {
         tableView.deselectRow(at: indexPath, animated: true)
     }
 
-    override func tableView(_ tableView: UITableView,
-                            editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
-        // This is required to allow swipe to delete action.
-        return nil
-    }
-
     override func tableView(_ tableView: UITableView,
                             commit editingStyle: UITableViewCell.EditingStyle,
                             forRowAt indexPath: IndexPath) {
@@ -134,9 +128,9 @@ class NodeAppKeysViewController: ProgressViewController, Editable {
         if node.contains(modelBoundToApplicationKey: applicationKey) {
             confirm(title: "Remove Key", message: "The selected key is bound to one or more " +
                 "models in the Node. When removed, it will be unbound automatically, and the " +
-                "models may stop working.") { _ in
+                "models may stop working.", handler:  { _ in
                 self.delete(applicationKey: applicationKey)
-            }
+            })
         } else {
             // Otherwise, just try removing it.
             delete(applicationKey: applicationKey)

Example/Source/View Controllers/Network/Configuration/NodeNetworkKeysViewController.swift

@@ -123,10 +123,13 @@ class NodeNetworkKeysViewController: ProgressViewController, Editable {
         return node.networkKeys.count == 1 ? .none : .delete
     }
 
-    override func tableView(_ tableView: UITableView,
-                            editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         if node.networkKeys.count == 1 {
-            return [UITableViewRowAction(style: .normal, title: "Last Key", handler: {_,_ in })]
+            return UISwipeActionsConfiguration(actions: [
+                UIContextualAction(style: .normal, title: "Last Key", handler: { _, _, completionHandler in
+                    completionHandler(false)
+                })
+            ])
         }
         return nil
     }
@@ -139,9 +142,9 @@ class NodeNetworkKeysViewController: ProgressViewController, Editable {
         if node.contains(applicationKeyBoundToNetworkKey: networkKey) {
             confirm(title: "Remove Key", message: "The selected key is bound to one or more " +
                 "Application Keys in the Node. When removed, those keys will also be removed " +
-                "and all models bound to them will be unbound, which may cause them to stop working.") { _ in
+                "and all models bound to them will be unbound, which may cause them to stop working.", handler: { _ in
                 self.deleteNetworkKey(networkKey)
-            }
+            })
         } else {
             // Otherwise, just try removing it.
             deleteNetworkKey(networkKey)

Example/Source/View Controllers/Network/Configuration/NodeScenesViewController.swift

@@ -149,13 +149,17 @@ class NodeScenesViewController: ProgressViewController, Editable {
         tableView.deselectRow(at: indexPath, animated: true)
     }
 
-    override func tableView(_ tableView: UITableView,
-                            editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         if !isSceneClientReadyToSetup {
-            return [UITableViewRowAction(style: .normal, title: "Client not ready", handler: {
-                [unowned self] _,_ in
-                _ = self.ensureClientReadyToDelete()
-            })]
+            return UISwipeActionsConfiguration(actions: [
+                UIContextualAction(style: .normal, title: "Client not ready", handler: { [weak self] _, _, completionHandler  in
+                    guard let self = self else {
+                        completionHandler(false)
+                        return
+                    }
+                    completionHandler(self.ensureClientReadyToDelete())
+                })
+            ])
         }
         return nil
     }

Example/Source/View Controllers/Settings/AppKeysViewController.swift

@@ -148,13 +148,17 @@ class AppKeysViewController: UITableViewController, Editable {
         return applicationKey.isUsed(in: network) ? .none : .delete
     }
 
-    override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         let network = MeshNetworkManager.instance.meshNetwork!
         let applicationKey = network.applicationKeys[indexPath.keyIndex]
 
         // It should not be possible to delete a key that is in use.
         if applicationKey.isUsed(in: network) {
-            return [UITableViewRowAction(style: .normal, title: "Key in use", handler: {_,_ in })]
+            return UISwipeActionsConfiguration(actions: [
+                UIContextualAction(style: .normal, title: "Key in use", handler: { _, _, completionHandler in
+                    completionHandler(false)
+                })
+            ])
         }
         return nil
     }

Example/Source/View Controllers/Settings/NetworkKeysViewController.swift

@@ -118,14 +118,18 @@ class NetworkKeysViewController: UITableViewController, Editable {
         return networkKey.isPrimary || networkKey.isUsed(in: network) ? .none : .delete
     }
 
-    override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+    override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
         let network = MeshNetworkManager.instance.meshNetwork!
         let networkKey = network.networkKeys[indexPath.keyIndex]
 
         // It should not be possible to delete a key that is in use.
         if networkKey.isPrimary || networkKey.isUsed(in: network) {
             let title = networkKey.isPrimary ? "Primary Key" : "Key in use"
-            return [UITableViewRowAction(style: .normal, title: title, handler: {_,_ in })]
+            return UISwipeActionsConfiguration(actions: [
+                UIContextualAction(style: .normal, title: title, handler: { _, _, completionHandler in
+                    completionHandler(false)
+                })
+            ])
         }
         return nil
     }

Example/Source/View Controllers/Settings/Provisioners/EditProvisionerViewController.swift

@@ -233,7 +233,8 @@ private extension EditProvisionerViewController {
         let nodeAssigned = newAddress != nil || (node != nil && !disableConfigCapabilities)
         let action = !nodeAssigned ? nil : UIAlertAction(title: "Unassign", style: .destructive) { action in
             self.confirm(title: "Disable configuration capabilities",
-                         message: "A Provisioner without the unicast address assigned is not able to perform configuration operations.") { [weak self] _ in
+                         message: "A Provisioner without the unicast address assigned is not able to perform configuration operations.",
+                         handler: { [weak self] _ in
                             guard let self = self else { return }
                             self.disableConfigCapabilities = true
                             self.newAddress = nil
@@ -243,7 +244,7 @@ private extension EditProvisionerViewController {
                             self.newTtl = nil
                             self.deviceKeyCell.detailTextLabel?.text = "N/A"
                             self.deviceKeyCell.detailTextLabel?.font = .systemFont(ofSize: 17)
-            }
+            })
         }
         presentTextAlert(title: "Unicast address", message: "Hexadecimal value in range\n0001 - 7FFF.",
                          text: address, placeHolder: "Address", type: .unicastAddressRequired,