Exporting: Export to zip in a background thread

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
index dc2e27ef2164f537a52395dd169be7e50bafe60e..b003b08154164e586c836c13b7522bdc7f37d909 100644 (file)
--- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
@@ -76,17 +76,17 @@ class SettingsTableViewController: UITableViewController {
 
         let count = tunnelsManager.numberOfTunnels()
         let tunnelConfigurations = (0 ..< count).compactMap { tunnelsManager.tunnel(at: $0).tunnelConfiguration() }
-        do {
-            try ZipExporter.exportConfigFiles(tunnelConfigurations: tunnelConfigurations, to: destinationURL)
-        } catch (let error) {
-            ErrorPresenter.showErrorAlert(error: error, from: self)
+        ZipExporter.exportConfigFiles(tunnelConfigurations: tunnelConfigurations, to: destinationURL) { [weak self] (error) in
+            if let error = error {
+                ErrorPresenter.showErrorAlert(error: error, from: self)
+                return
+            }
+            let activityVC = UIActivityViewController(activityItems: [destinationURL], applicationActivities: nil)
+            // popoverPresentationController shall be non-nil on the iPad
+            activityVC.popoverPresentationController?.sourceView = sourceView
+            activityVC.popoverPresentationController?.sourceRect = sourceView.bounds
+            self?.present(activityVC, animated: true)
         }
-
-        let activityVC = UIActivityViewController(activityItems: [destinationURL], applicationActivities: nil)
-        // popoverPresentationController shall be non-nil on the iPad
-        activityVC.popoverPresentationController?.sourceView = sourceView
-        activityVC.popoverPresentationController?.sourceRect = sourceView.bounds
-        present(activityVC, animated: true)
     }
 
     func showErrorAlert(title: String, message: String) {

diff --git a/WireGuard/WireGuard/ZipArchive/ZipExporter.swift b/WireGuard/WireGuard/ZipArchive/ZipExporter.swift
index d0cf9a7ec65a4caf306c4aa54fb37a189931e1fd..bd6c3dd908c3d3f4efb72ebaabd2b749f58793ba 100644 (file)
--- a/WireGuard/WireGuard/ZipArchive/ZipExporter.swift
+++ b/WireGuard/WireGuard/ZipArchive/ZipExporter.swift
@@ -8,21 +8,30 @@ enum ZipExporterError: Error {
 }
 
 class ZipExporter {
-    static func exportConfigFiles(tunnelConfigurations: [TunnelConfiguration], to destinationURL: URL) throws {
+    static func exportConfigFiles(tunnelConfigurations: [TunnelConfiguration], to url: URL, completion: @escaping (Error?) -> Void)  {
 
-        guard (!tunnelConfigurations.isEmpty) else { throw ZipExporterError.noTunnelsToExport }
-
-        var inputsToArchiver: [(fileName: String, contents: Data)] = []
-
-        var lastTunnelName: String = ""
-        for tunnelConfiguration in tunnelConfigurations {
-            if let contents = WgQuickConfigFileWriter.writeConfigFile(from: tunnelConfiguration) {
-                let name = tunnelConfiguration.interface.name
-                if (name.isEmpty || name == lastTunnelName) { continue }
-                inputsToArchiver.append((fileName: "\(name).conf", contents: contents))
-                lastTunnelName = name
+        guard (!tunnelConfigurations.isEmpty) else {
+            completion(ZipExporterError.noTunnelsToExport)
+            return
+        }
+        DispatchQueue.global(qos: .userInitiated).async {
+            var inputsToArchiver: [(fileName: String, contents: Data)] = []
+            var lastTunnelName: String = ""
+            for tunnelConfiguration in tunnelConfigurations {
+                if let contents = WgQuickConfigFileWriter.writeConfigFile(from: tunnelConfiguration) {
+                    let name = tunnelConfiguration.interface.name
+                    if (name.isEmpty || name == lastTunnelName) { continue }
+                    inputsToArchiver.append((fileName: "\(name).conf", contents: contents))
+                    lastTunnelName = name
+                }
+            }
+            do {
+                try ZipArchive.archive(inputs: inputsToArchiver, to: url)
+            } catch (let e) {
+                DispatchQueue.main.async { completion(e) }
+                return
             }
+            DispatchQueue.main.async { completion(nil) }
         }
-        try ZipArchive.archive(inputs: inputsToArchiver, to: destinationURL)
     }
 }