From 3197f4936896227fd6f29a01d232c4750a99aae4 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Sat, 30 Mar 2019 23:26:28 +0100
Subject: [PATCH] Add down/up indication of data count

Other improvements:

- TunnelKit reports 0 rather than nil upon connection.
- Fall back to "Unavailable" rather than empty string.
---
 Passepartout-iOS/Scenes/ServiceViewController.swift |  2 +-
 Passepartout/Resources/en.lproj/Localizable.strings |  3 ++-
 Passepartout/Sources/SwiftGen+Strings.swift         |  4 +++-
 Podfile                                             |  4 ++--
 Podfile.lock                                        | 10 +++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift
index 083bdfd6..2baba8b7 100644
--- a/Passepartout-iOS/Scenes/ServiceViewController.swift
+++ b/Passepartout-iOS/Scenes/ServiceViewController.swift
@@ -760,7 +760,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
             if let count = currentDataCount, vpn.status == .connected {
                 cell.rightText = L10n.Service.Cells.DataCount.value(count.0.dataUnitDescription, count.1.dataUnitDescription)
             } else {
-                cell.rightText = nil
+                cell.rightText = L10n.Service.Cells.DataCount.none
             }
             cell.accessoryType = .none
             cell.isTappable = false
diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings
index a1100153..f47f8fb9 100644
--- a/Passepartout/Resources/en.lproj/Localizable.strings
+++ b/Passepartout/Resources/en.lproj/Localizable.strings
@@ -108,7 +108,8 @@
 "service.cells.trusted_policy.caption" = "Trust disables VPN";
 "service.cells.test_connectivity.caption" = "Test connectivity";
 "service.cells.data_count.caption" = "Exchanged data count";
-"service.cells.data_count.value" = "%@ / %@";
+"service.cells.data_count.value" = "↓%@ / ↑%@";
+"service.cells.data_count.none" = "Unavailable";
 "service.cells.debug_log.caption" = "Debug log";
 "service.cells.masks_private_data.caption" = "Mask network data";
 "service.cells.report_issue.caption" = "Report connectivity issue";
diff --git a/Passepartout/Sources/SwiftGen+Strings.swift b/Passepartout/Sources/SwiftGen+Strings.swift
index 01171a2a..d47a7b6d 100644
--- a/Passepartout/Sources/SwiftGen+Strings.swift
+++ b/Passepartout/Sources/SwiftGen+Strings.swift
@@ -543,7 +543,9 @@ public enum L10n {
       public enum DataCount {
         /// Exchanged data count
         public static let caption = L10n.tr("Localizable", "service.cells.data_count.caption")
-        /// %@ / %@
+        /// Unavailable
+        public static let `none` = L10n.tr("Localizable", "service.cells.data_count.none")
+        /// ↓%@ / ↑%@
         public static func value(_ p1: String, _ p2: String) -> String {
           return L10n.tr("Localizable", "service.cells.data_count.value", p1, p2)
         }
diff --git a/Podfile b/Podfile
index 15dea33b..2b016252 100644
--- a/Podfile
+++ b/Podfile
@@ -5,8 +5,8 @@ use_frameworks!
 def shared_pods
     #pod 'TunnelKit', '~> 1.5.0'
     #pod 'TunnelKit/LZO', '~> 1.5.0'
-    pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '93a7729'
-    pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => '93a7729'
+    pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'a638767'
+    pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'a638767'
     #pod 'TunnelKit', :path => '../../personal/tunnelkit'
     #pod 'TunnelKit/LZO', :path => '../../personal/tunnelkit'
 end
diff --git a/Podfile.lock b/Podfile.lock
index b96d9a5e..0b186b9a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -15,8 +15,8 @@ PODS:
 
 DEPENDENCIES:
   - MBProgressHUD
-  - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `93a7729`)
-  - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `93a7729`)
+  - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `a638767`)
+  - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `a638767`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -26,12 +26,12 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   TunnelKit:
-    :commit: 93a7729
+    :commit: a638767
     :git: https://github.com/keeshux/tunnelkit
 
 CHECKOUT OPTIONS:
   TunnelKit:
-    :commit: 93a7729
+    :commit: a638767
     :git: https://github.com/keeshux/tunnelkit
 
 SPEC CHECKSUMS:
@@ -40,6 +40,6 @@ SPEC CHECKSUMS:
   SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165
   TunnelKit: 9d8089c4600ea9b3a54841391b4969f2faa9c17f
 
-PODFILE CHECKSUM: 6010aa429513f9c70c23f9087ac02d60b1a183b6
+PODFILE CHECKSUM: 41cfe6321ea8695a6288fd8009199854a1a8fbe2
 
 COCOAPODS: 1.6.1