passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-01-31 04:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always donate a MoveTo when provider

Browse Source
This commit is contained in:
Davide De Rosa 2019-03-09 11:59:05 +01:00
parent b841552121
commit 9dcd6de873
3 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Passepartout-iOS/Intents/InteractionsHandler.swift
View File

@ -41,14 +41,24 @@ class InteractionsHandler {
static let trust = "Trust"
}
static func donateConnectVPN(with profile: ConnectionProfile) {
static func donateConnection(with profile: ConnectionProfile) {
let profileKey = ProfileKey(profile)
let genericIntent: INIntent
let intent = ConnectVPNIntent()
intent.context = profileKey.context.rawValue
intent.profileId = profileKey.id
if let provider = profile as? ProviderConnectionProfile, let pool = provider.pool {
let intent = MoveToLocationIntent()
intent.providerId = profile.id
intent.poolId = pool.id
intent.poolName = pool.name
genericIntent = intent
} else {
let intent = ConnectVPNIntent()
intent.context = profileKey.context.rawValue
intent.profileId = profileKey.id
genericIntent = intent
}
let interaction = INInteraction(intent: intent, response: nil)
let interaction = INInteraction(intent: genericIntent, response: nil)
interaction.groupIdentifier = profileKey.rawValue
interaction.donateAndLog()
}
@ -61,19 +71,6 @@ class InteractionsHandler {
interaction.donateAndLog()
}
static func donateMoveToLocation(with profile: ProviderConnectionProfile, pool: Pool) {
let profileKey = ProfileKey(profile)
let intent = MoveToLocationIntent()
intent.providerId = profile.id
intent.poolId = pool.id
intent.poolName = pool.name
let interaction = INInteraction(intent: intent, response: nil)
interaction.groupIdentifier = profileKey.rawValue
interaction.donateAndLog()
}
static func donateTrustCurrentNetwork() {
let intent = TrustCurrentNetworkIntent()

4
Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
View File

@ -472,7 +472,7 @@ extension OrganizerViewController: ConnectionServiceDelegate {
tableView.reloadData()
if #available(iOS 12, *) {
InteractionsHandler.donateConnectVPN(with: profile)
InteractionsHandler.donateConnection(with: profile)
}
// XXX: hack around bad replace when detail presented in compact view
@ -519,7 +519,7 @@ extension OrganizerViewController: ConnectionServiceDelegate {
tableView.reloadData()
if #available(iOS 12, *) {
InteractionsHandler.donateConnectVPN(with: profile)
InteractionsHandler.donateConnection(with: profile)
}
}
}

8
Passepartout-iOS/Scenes/ServiceViewController.swift
View File

@ -256,11 +256,7 @@ class ServiceViewController: UIViewController, TableModelHost {
}
if #available(iOS 12, *) {
if let provider = profile as? ProviderConnectionProfile, let pool = provider.pool {
InteractionsHandler.donateMoveToLocation(with: provider, pool: pool)
} else {
InteractionsHandler.donateConnectVPN(with: uncheckedProfile)
}
InteractionsHandler.donateConnection(with: uncheckedProfile)
}
}
@ -1095,7 +1091,7 @@ extension ServiceViewController: ProviderPoolViewControllerDelegate {
vpn.reinstallIfEnabled()
if #available(iOS 12, *) {
InteractionsHandler.donateMoveToLocation(with: uncheckedProviderProfile, pool: pool)
InteractionsHandler.donateConnection(with: uncheckedProviderProfile)
}
}
}