passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-01-17 22:19:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Infer profile id uniqueness by context

Browse Source 
Drop "(provider|host)." prefix, reuse as title.
This commit is contained in:
Davide De Rosa 2018-10-25 23:08:43 +02:00
parent 8f29f79168
commit 8e1b67d151
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,7 +313,7 @@ extension OrganizerViewController {
case .profile: case .profile:
let cell = Cells.setting.dequeue(from: tableView, for: indexPath) let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
let rowProfile = profile(at: indexPath) let rowProfile = profile(at: indexPath)
cell.leftText = rowProfile.title cell.leftText = rowProfile.id
cell.rightText = service.isActiveProfile(rowProfile) ? L10n.Organizer.Cells.Profile.Value.current : nil cell.rightText = service.isActiveProfile(rowProfile) ? L10n.Organizer.Cells.Profile.Value.current : nil
return cell return cell

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

@ -37,7 +37,7 @@ class ServiceViewController: UIViewController, TableModelHost {
var profile: ConnectionProfile? { var profile: ConnectionProfile? {
didSet { didSet {
title = profile?.title title = profile?.id
reloadModel() reloadModel()
updateViewsIfNeeded() updateViewsIfNeeded()
} }
@ -78,7 +78,7 @@ class ServiceViewController: UIViewController, TableModelHost {
lastInfrastructureUpdate = InfrastructureFactory.shared.modificationDate(for: providerProfile.name) lastInfrastructureUpdate = InfrastructureFactory.shared.modificationDate(for: providerProfile.name)
} }
title = profile?.title title = profile?.id
navigationItem.leftBarButtonItem = splitViewController?.displayModeButtonItem navigationItem.leftBarButtonItem = splitViewController?.displayModeButtonItem
navigationItem.leftItemsSupplementBackButton = true navigationItem.leftItemsSupplementBackButton = true

2
Passepartout/Sources/Model/ConnectionProfile.swift
View File

@ -29,8 +29,6 @@ import NetworkExtension
protocol ConnectionProfile: class, EndpointDataSource { protocol ConnectionProfile: class, EndpointDataSource {
var id: String { get } var id: String { get }
var title: String { get }
var username: String? { get set } var username: String? { get set }

6
Passepartout/Sources/Model/Profiles/HostConnectionProfile.swift
View File

@ -27,6 +27,8 @@ import Foundation
import TunnelKit import TunnelKit
class HostConnectionProfile: ConnectionProfile, Codable, Equatable { class HostConnectionProfile: ConnectionProfile, Codable, Equatable {
var title: String
let hostname: String let hostname: String
var parameters: TunnelKitProvider.Configuration var parameters: TunnelKitProvider.Configuration
@ -41,10 +43,8 @@ class HostConnectionProfile: ConnectionProfile, Codable, Equatable {
// MARK: ConnectionProfile // MARK: ConnectionProfile
var id: String { var id: String {
return "host.\(title)" return title
} }
var title: String
var username: String? var username: String?

5
Passepartout/Sources/Model/Profiles/ProviderConnectionProfile.swift
View File

@ -66,7 +66,6 @@ class ProviderConnectionProfile: ConnectionProfile, Codable, Equatable {
poolId = "" poolId = ""
presetId = "" presetId = ""
id = "provider.\(name.rawValue)"
username = nil username = nil
poolId = infrastructure.defaults.pool poolId = infrastructure.defaults.pool
@ -93,9 +92,7 @@ class ProviderConnectionProfile: ConnectionProfile, Codable, Equatable {
// MARK: ConnectionProfile // MARK: ConnectionProfile
let id: String var id: String {
var title: String {
return name.rawValue return name.rawValue
} }