More formatting nits and cyclomatic complexity fixes
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
This commit is contained in:
@@ -8,7 +8,7 @@ enum ZipArchiveError: WireGuardAppError {
|
||||
case cantOpenOutputZipFileForWriting
|
||||
case badArchive
|
||||
|
||||
func alertText() -> (String, String)? {
|
||||
func alertText() -> AlertText {
|
||||
switch self {
|
||||
case .cantOpenInputZipFile:
|
||||
return ("Unable to read zip archive", "The zip archive could not be read.")
|
||||
@@ -41,7 +41,7 @@ class ZipArchive {
|
||||
|
||||
static func unarchive(url: URL, requiredFileExtensions: [String]) throws -> [(fileBaseName: String, contents: Data)] {
|
||||
|
||||
var results: [(fileBaseName: String, contents: Data)] = []
|
||||
var results = [(fileBaseName: String, contents: Data)]()
|
||||
|
||||
guard let zipFile = unzOpen64(url.path) else {
|
||||
throw ZipArchiveError.cantOpenInputZipFile
|
||||
|
||||
@@ -6,7 +6,7 @@ import UIKit
|
||||
enum ZipExporterError: WireGuardAppError {
|
||||
case noTunnelsToExport
|
||||
|
||||
func alertText() -> (String, String)? {
|
||||
func alertText() -> AlertText {
|
||||
switch self {
|
||||
case .noTunnelsToExport:
|
||||
return ("Nothing to export", "There are no tunnels to export")
|
||||
@@ -15,8 +15,7 @@ enum ZipExporterError: WireGuardAppError {
|
||||
}
|
||||
|
||||
class ZipExporter {
|
||||
static func exportConfigFiles(tunnelConfigurations: [TunnelConfiguration], to url: URL,
|
||||
completion: @escaping (WireGuardAppError?) -> Void) {
|
||||
static func exportConfigFiles(tunnelConfigurations: [TunnelConfiguration], to url: URL, completion: @escaping (WireGuardAppError?) -> Void) {
|
||||
|
||||
guard !tunnelConfigurations.isEmpty else {
|
||||
completion(ZipExporterError.noTunnelsToExport)
|
||||
|
||||
@@ -6,7 +6,7 @@ import UIKit
|
||||
enum ZipImporterError: WireGuardAppError {
|
||||
case noTunnelsInZipArchive
|
||||
|
||||
func alertText() -> (String, String)? {
|
||||
func alertText() -> AlertText {
|
||||
switch self {
|
||||
case .noTunnelsInZipArchive:
|
||||
return ("No tunnels in zip archive", "No .conf tunnel files were found inside the zip archive.")
|
||||
|
||||
Reference in New Issue
Block a user