diff options
author | Eric Kuck <eric@bluelinelabs.com> | 2018-12-21 15:16:09 -0600 |
---|---|---|
committer | Eric Kuck <eric@bluelinelabs.com> | 2018-12-21 16:32:08 -0600 |
commit | 1fecd8eb6c5c2327d4bfd5044876be12876fc7e5 (patch) | |
tree | 45c7f4c552eb01bd15c54e58615c9122acc99e83 /WireGuard/Shared/LegacyConfigMigration.swift | |
parent | Do not require NetworkExtension to know its own name (diff) | |
download | wireguard-apple-1fecd8eb6c5c2327d4bfd5044876be12876fc7e5.tar.xz wireguard-apple-1fecd8eb6c5c2327d4bfd5044876be12876fc7e5.zip |
providerConfiguration is now a WgQuickConfig
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to 'WireGuard/Shared/LegacyConfigMigration.swift')
-rw-r--r-- | WireGuard/Shared/LegacyConfigMigration.swift | 7 |
1 files changed, 2 insertions, 5 deletions
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()] } } |