Import Core framework into iOS target

Passepartout-iOS/AppDelegate.swift

@@ -25,6 +25,7 @@
 
 import UIKit
 import TunnelKit
+import Passepartout_Core
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {

Passepartout-iOS/Global/IssueReporter.swift

@@ -26,6 +26,7 @@
 import Foundation
 import TunnelKit
 import MessageUI
+import Passepartout_Core
 
 class IssueReporter: NSObject {
     struct Attachments {

Passepartout-iOS/Global/ParsingResult+Alerts.swift

@@ -27,6 +27,7 @@ import Foundation
 import UIKit
 import TunnelKit
 import SwiftyBeaver
+import Passepartout_Core
 
 private let log = SwiftyBeaver.self
 

Passepartout-iOS/Global/Theme+Cells.swift

@@ -25,6 +25,7 @@
 
 import UIKit
 import TunnelKit
+import Passepartout_Core
 
 extension UITableViewCell {
     func applyChecked(_ checked: Bool, _ theme: Theme) {

Passepartout-iOS/Global/Theme.swift

@@ -25,6 +25,7 @@
 
 import UIKit
 import MessageUI
+import Passepartout_Core
 
 extension UIColor {
     convenience init(rgb: UInt32, alpha: CGFloat) {

Passepartout-iOS/Intents/InteractionsHandler.swift

@@ -26,6 +26,7 @@
 import Foundation
 import Intents
 import SwiftyBeaver
+import Passepartout_Core
 
 private let log = SwiftyBeaver.self
 

Passepartout-iOS/Scenes/AccountViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 protocol AccountViewControllerDelegate: class {
     func accountController(_: AccountViewController, didEnterCredentials credentials: Credentials)

Passepartout-iOS/Scenes/ConfigurationViewController.swift

@@ -26,6 +26,7 @@
 import UIKit
 import TunnelKit
 import SwiftyBeaver
+import Passepartout_Core
 
 private let log = SwiftyBeaver.self
 

Passepartout-iOS/Scenes/DebugLogViewController.swift

@@ -25,6 +25,7 @@
 
 import UIKit
 import SwiftyBeaver
+import Passepartout_Core
 
 private let log = SwiftyBeaver.self
 

Passepartout-iOS/Scenes/EndpointViewController.swift

@@ -25,6 +25,7 @@
 
 import UIKit
 import TunnelKit
+import Passepartout_Core
 
 protocol EndpointViewControllerDelegate: class {
     func endpointController(_: EndpointViewController, didUpdateWithNewAddress newAddress: String?, newProtocol: EndpointProtocol?)

Passepartout-iOS/Scenes/Organizer/AboutViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 class AboutViewController: UITableViewController, TableModelHost {
 

Passepartout-iOS/Scenes/Organizer/CreditsViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 class CreditsViewController: UITableViewController, TableModelHost {
     private let licenses = AppConstants.License.all

Passepartout-iOS/Scenes/Organizer/ImportedHostsViewController.swift

@@ -26,6 +26,7 @@
 import UIKit
 import TunnelKit
 import SwiftyBeaver
+import Passepartout_Core
 
 private let log = SwiftyBeaver.self
 

Passepartout-iOS/Scenes/Organizer/LabelViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 class LabelViewController: UIViewController {
     @IBOutlet private weak var scrollView: UIScrollView?

Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 // XXX: convoluted due to the separation of provider/host profiles
 

Passepartout-iOS/Scenes/Organizer/VersionViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 class VersionViewController: UIViewController {
     @IBOutlet private weak var scrollView: UIScrollView?

Passepartout-iOS/Scenes/Organizer/WizardHostViewController.swift

@@ -26,6 +26,7 @@
 import UIKit
 import TunnelKit
 import SwiftyBeaver
+import Passepartout_Core
 
 private let log = SwiftyBeaver.self
 

Passepartout-iOS/Scenes/Organizer/WizardProviderViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 class WizardProviderViewController: UITableViewController {
     var availableNames: [Infrastructure.Name] = []

Passepartout-iOS/Scenes/ProviderPoolViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 protocol ProviderPoolViewControllerDelegate: class {
     func providerPoolController(_: ProviderPoolViewController, didSelectPool pool: Pool)

Passepartout-iOS/Scenes/ProviderPresetViewController.swift

@@ -24,6 +24,7 @@
 //
 
 import UIKit
+import Passepartout_Core
 
 protocol ProviderPresetViewControllerDelegate: class {
     func providerPresetController(_: ProviderPresetViewController, didSelectPreset preset: InfrastructurePreset)

Passepartout-iOS/Scenes/ServiceViewController.swift

@@ -27,6 +27,7 @@ import UIKit
 import NetworkExtension
 import CoreTelephony
 import TunnelKit
+import Passepartout_Core
 
 class ServiceViewController: UIViewController, TableModelHost {
     @IBOutlet private weak var tableView: UITableView!
@@ -511,6 +512,19 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
         return ip
     }
     
+    private func mappedTrustedNetworksRow(_ from: TrustedNetworksModel.RowType) -> RowType {
+        switch from {
+        case .trustsMobile:
+            return .trustedMobile
+            
+        case .trustedWiFi:
+            return .trustedWiFi
+            
+        case .addCurrentWiFi:
+            return .trustedAddCurrentWiFi
+        }
+    }
+    
     func numberOfSections(in tableView: UITableView) -> Int {
         return model.count
     }
@@ -938,7 +952,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
 
         trustedNetworks.delegate = self
         trustedNetworks.load(from: service.preferences)
-        model.set(trustedNetworks.rows, in: .trusted)
+        model.set(trustedNetworks.rows.map { mappedTrustedNetworksRow($0) }, in: .trusted)
     }
 
     private func reloadVpnStatus() {
@@ -1005,7 +1019,7 @@ extension ServiceViewController: TrustedNetworksModelDelegate {
     }
     
     func trustedNetworks(_: TrustedNetworksModel, shouldInsertWifiAt rowIndex: Int) {
-        model.set(trustedNetworks.rows, in: .trusted)
+        model.set(trustedNetworks.rows.map { mappedTrustedNetworksRow($0) }, in: .trusted)
         tableView.insertRows(at: [IndexPath(row: rowIndex, section: trustedSectionIndex)], with: .bottom)
     }
     
@@ -1021,7 +1035,7 @@ extension ServiceViewController: TrustedNetworksModelDelegate {
     }
     
     func trustedNetworks(_: TrustedNetworksModel, shouldDeleteWifiAt rowIndex: Int) {
-        model.set(trustedNetworks.rows, in: .trusted)
+        model.set(trustedNetworks.rows.map { mappedTrustedNetworksRow($0) }, in: .trusted)
         tableView.deleteRows(at: [IndexPath(row: rowIndex, section: trustedSectionIndex)], with: .top)
     }
     

Passepartout/Sources/Model/TrustedNetworks.swift

@@ -40,6 +40,14 @@ public protocol TrustedNetworksModelDelegate: class {
 }
 
 public class TrustedNetworksModel {
+    public enum RowType {
+        case trustsMobile
+        
+        case trustedWiFi
+        
+        case addCurrentWiFi
+    }
+    
     public private(set) var trustedWifis: [String: Bool]
     
     public private(set) var sortedWifis: [String]
@@ -49,9 +57,7 @@ public class TrustedNetworksModel {
     
     public private(set) var trustsMobileNetwork: Bool
 
-    // FIXME
+    public private(set) var rows: [RowType]
-//    public private(set) var rows: [ServiceViewController.RowType]
-    public private(set) var rows: [Int]
     #endif
     
     public weak var delegate: TrustedNetworksModelDelegate?
@@ -73,15 +79,14 @@ public class TrustedNetworksModel {
 
         #if os(iOS)
         trustsMobileNetwork = preferences.trustsMobileNetwork
-        // FIXME
+        rows.removeAll()
-//        rows.removeAll()
+        if hasMobileNetwork {
-//        if hasMobileNetwork {
+            rows.append(.trustsMobile)
-//            rows.append(.trustedMobile)
+        }
-//        }
+        for _ in sortedWifis {
-//        for _ in sortedWifis {
+            rows.append(.trustedWiFi)
-//            rows.append(.trustedWiFi)
+        }
-//        }
+        rows.append(.addCurrentWiFi)
-//        rows.append(.trustedAddCurrentWiFi)
         #endif
     }
     
@@ -139,8 +144,7 @@ public class TrustedNetworksModel {
         if !isDuplicate {
             sortedWifis.insert(wifiToAdd, at: index)
             #if os(iOS)
-            // FIXME
+            rows.insert(.trustedWiFi, at: rowIndex)
-//            rows.insert(.trustedWiFi, at: rowIndex)
             #endif
             delegate?.trustedNetworks(self, shouldInsertWifiAt: rowIndex)
         } else {