Merge pull request #143 from confirmedcode/release/1.6.1

Release 1.6.1

Author: hijohnnylin

.swiftlint.yml

@@ -0,0 +1,71 @@
+warning_threshold: 1
+
+disabled_rules:
+  - unused_setter_value
+  - trailing_whitespace
+  - comment_spacing
+  - vertical_whitespace
+  - colon
+  - function_body_length
+  - cyclomatic_complexity
+  - weak_delegate
+  - multiple_closures_with_trailing_closure
+  - compiler_protocol_init
+  - todo
+  - trailing_comma
+  - notification_center_detachment
+  - identifier_name
+  - block_based_kvo
+  - empty_enum_arguments
+  - inclusive_language
+
+opt_in_rules: # some rules are only opt-in
+  #- control_statement
+  - empty_count
+  #- trailing_newline
+  #- colon
+  #- comma
+  - empty_string
+  - unused_declaration
+  - explicit_self
+  
+included: # paths to include during linting. `--path` is ignored if present.
+  - LockdowniOS
+  
+excluded: # paths to ignore during linting. Takes precedence over `included`.
+  - Pods
+  - lockdownTests
+  
+line_length:
+    warning: 155
+    ignores_comments: true
+
+force_try:
+  severity: warning
+
+type_body_length:
+  warning: 500
+  error: 1000
+
+file_length:
+  warning: 1200
+  error: 1200
+
+large_tuple:
+  warning: 7
+  error: 10
+  
+function_parameter_count:
+  warning: 5
+   
+type_name:
+  min_length: 3
+  max_length: 40
+  
+deployment_target:
+  iOS_deployment_target: 11.0
+  
+unused_declaration:
+  include_public_and_open: true
+  
+reporter: "xcode"

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewall.imageset/ComparisonTableFirewallDark.pdf

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "filename" : "Firewall-1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "Firewall.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ComparisonTableFirewallDark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewall.imageset/Contents.json

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "filename" : "FirewallAndVPN.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "FirewallAndVPN-1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ComparisonTableFirewallAndVpnDark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewall.imageset/Firewall-1.pdf

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "filename" : "Table.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "Table 1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Table 2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewall.imageset/Firewall.pdf

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "filename" : "Table 2.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "Table.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Table 1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewallAndVPN.imageset/ComparisonTableFirewallAndVpnDark.pdf

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewallAndVPN.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Lock.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewallAndVPN.imageset/FirewallAndVPN-1.pdf

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "check.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Assets.xcassets/Complex Paywall Table Images/ComparisonTableFirewallAndVPN.imageset/FirewallAndVPN.pdf

@@ -1,4 +1,4 @@
-github "CocoaLumberjack/CocoaLumberjack" "3.7.4"
+github "CocoaLumberjack/CocoaLumberjack" "3.8.0"
 github "behrang/YamlSwift" "3.4.3"
 github "confirmedcode/NEKit" "c615bf40940bb9b42f3c10cf1e887bfb921544c8"
 github "robbiehanson/CocoaAsyncSocket" "7.6.5"

Assets.xcassets/Complex Paywall Table Images/ComparisonTablePRO.imageset/ComparisonTableProDark.pdf

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 struct IP: Codable {
     let ip: String
@@ -25,7 +26,7 @@ struct SubscriptionEvent: Codable {
     let message: String
 }
 
-struct Subscription: Codable {
+public struct Subscription: Codable {
     let planType: PlanType
     let receiptId: String
     let expirationDate: String
@@ -44,7 +45,36 @@ struct Subscription: Codable {
         static let monthly = PlanType(rawValue: "ios-monthly")
         static let annual = PlanType(rawValue: "ios-annual")
         static let proMonthly = PlanType(rawValue: "all-monthly")
-        static let proAnnual = PlanType(rawValue: "all-annual")        
+        static let proAnnual = PlanType(rawValue: "all-annual")
+        static let proAnnualLTO = PlanType(rawValue: "all-annual")
+    }
+    
+    var correspondingProductGroup: AppStoreProductGroup {
+        switch planType {
+        case .monthly, .annual:
+            return .firewallAndVpn
+        case .proMonthly, .proAnnual, .proAnnualLTO:
+            return .pro
+        default:
+            return .firewallAndVpn
+        }
+    }
+    
+    public var hasVPN: Bool { [.firewallAndVpn, .pro].contains(correspondingProductGroup) }
+    
+    var correspondingPeriodUnit: SubscriptionOfferPeriodUnit {
+        switch planType {
+        case .monthly, .proMonthly:
+            return .month
+        case .annual, .proAnnual, .proAnnualLTO:
+            return .year
+        default:
+            return .year
+        }
+    }
+    
+    func isSubscription(in group: AppStoreProductGroup, of period: SubscriptionOfferPeriodUnit) -> Bool {
+        return group == correspondingProductGroup && period == correspondingPeriodUnit
     }
 }
 

Assets.xcassets/Complex Paywall Table Images/ComparisonTablePRO.imageset/Contents.json

@@ -9,11 +9,35 @@
 import Foundation
 import CocoaLumberjackSwift
 
-let vpnSourceID = "-111818" //getEnvironmentVariable(key: "vpnSourceID", default: "-111818")
-let vpnDomain = "confirmedvpn.com" //getEnvironmentVariable(key: "vpnDomain", default: "confirmedvpn.com")
+// getEnvironmentVariable(key: "vpnSourceID", default: "-111818")
+let vpnSourceID: String = {
+    #if DEBUG
+        return "-111618"
+    #else
+        return "-111818"
+    #endif
+}()
+
+// getEnvironmentVariable(key: "vpnDomain", default: "confirmedvpn.com")
+let vpnDomain: String = {
+    #if DEBUG
+        return "trusty-ap.science"
+    #else
+        return "confirmedvpn.com"
+    #endif
+}()
+
 let vpnRemoteIdentifier = "www" + vpnSourceID + "." + vpnDomain
 
-let mainDomain = "confirmedvpn.com" //getEnvironmentVariable(key: "mainDomain", default: "confirmedvpn.com")
+// getEnvironmentVariable(key: "mainDomain", default: "confirmedvpn.com")
+let mainDomain: String = {
+    #if DEBUG
+        return "trusty-ap.science"
+    #else
+        return "confirmedvpn.com"
+    #endif
+}()
+
 let mainURL = "https://www." + mainDomain
 
 let testFirewallDomain = "example.com"

Assets.xcassets/Complex Paywall Table Images/ComparisonTablePRO.imageset/PRO-1.pdf

@@ -85,7 +85,7 @@ class FirewallTodayViewController: UIViewController, NCWidgetProviding {
 
     @objc func updateMetrics() {
         DispatchQueue.main.async {
-            self.blockedTodayLabel.text = getDayMetricsString() + NSLocalizedString(" Blocked Today", comment: "refers to number of connections blocked today, as in '34 Blocked Today'")
+            self.blockedTodayLabel.text = getDayMetricsString() + .localized(" Blocked Today", comment: "refers to number of connections blocked today, as in '34 Blocked Today'")
         }
     }
 
@@ -132,23 +132,23 @@ class FirewallTodayViewController: UIViewController, NCWidgetProviding {
     }
 
     func setFirewallButtonConnected() {
-        firewallStatusLabel.text = NSLocalizedString("Firewall Active", comment: "")
+        firewallStatusLabel.text = .localized("Firewall Active")
         toggleFirewall?.tintColor = .tunnelsBlue
         toggleFirewall.layer.borderColor = UIColor.tunnelsBlue.cgColor
     }
 
     func setFirewallButtonDisconnected() {
-        firewallStatusLabel.text = NSLocalizedString("Firewall Not Active", comment: "")
+        firewallStatusLabel.text = .localized("Firewall Not Active")
         toggleFirewall?.tintColor = UIColor.darkGray
         toggleFirewall?.layer.borderColor = UIColor.darkGray.cgColor
     }
 
     func setFirewallButtonConnecting() {
-        firewallStatusLabel.text = NSLocalizedString("Activating", comment: "")
+        firewallStatusLabel.text = .localized("Activating")
     }
 
     func setFirewallButtonDisconnecting() {
-        firewallStatusLabel.text = NSLocalizedString("Deactivating", comment: "")
+        firewallStatusLabel.text = .localized("Deactivating")
     }
 
     // MARK: - Helpers