From 1fecd8eb6c5c2327d4bfd5044876be12876fc7e5 Mon Sep 17 00:00:00 2001 From: Eric Kuck Date: Fri, 21 Dec 2018 15:16:09 -0600 Subject: providerConfiguration is now a WgQuickConfig Signed-off-by: Eric Kuck --- WireGuard/Shared/LegacyConfigMigration.swift | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'WireGuard/Shared/LegacyConfigMigration.swift') diff --git a/WireGuard/Shared/LegacyConfigMigration.swift b/WireGuard/Shared/LegacyConfigMigration.swift index bd22ca4..e7588a2 100644 --- a/WireGuard/Shared/LegacyConfigMigration.swift +++ b/WireGuard/Shared/LegacyConfigMigration.swift @@ -186,11 +186,8 @@ extension NETunnelProviderProtocol { private func migrateFromConfigurationV1() { guard let serializedTunnelConfiguration = providerConfiguration?["tunnelConfiguration"] as? Data else { return } - guard let configuration = try? JSONDecoder().decode(LegacyTunnelConfiguration.self, from: serializedTunnelConfiguration) else { return } - guard let tunnelConfigData = try? JSONEncoder().encode(configuration.migrated) else { return } - guard let tunnelConfigDictionary = try? JSONSerialization.jsonObject(with: tunnelConfigData, options: .allowFragments) else { return } - - providerConfiguration = [Keys.wgQuickConfig.rawValue: tunnelConfigDictionary] + guard let configuration = try? JSONDecoder().decode(LegacyTunnelConfiguration.self, from: serializedTunnelConfiguration) else { return } + providerConfiguration = [Keys.wgQuickConfig.rawValue: configuration.migrated.asWgQuickConfig()] } } -- cgit v1.2.3-59-g8ed1b