diff --git a/Confirmed Blocker/Info.plist b/Confirmed Blocker/Info.plist
index a34b8b8..1d0dab0 100644
--- a/Confirmed Blocker/Info.plist
+++ b/Confirmed Blocker/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 1.3.2
+ 1.3.3
CFBundleVersion
- 14
+ 2
NSExtension
NSExtensionPointIdentifier
diff --git a/Confirmed Tunnels/Info.plist b/Confirmed Tunnels/Info.plist
index 2a78bcd..5295c20 100644
--- a/Confirmed Tunnels/Info.plist
+++ b/Confirmed Tunnels/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 1.3.2
+ 1.3.3
CFBundleVersion
- 14
+ 2
NSExtension
NSExtensionPointIdentifier
diff --git a/ConfirmediOS/IPSecV3.swift b/ConfirmediOS/IPSecV3.swift
index 827334e..f19de08 100644
--- a/ConfirmediOS/IPSecV3.swift
+++ b/ConfirmediOS/IPSecV3.swift
@@ -21,6 +21,12 @@ class IPSecV3: NSObject, ConfirmedVPNProtocol {
let endpoint = endpointForRegion(region: savedRegion)
let localId = Global.keychain[Global.kConfirmedID]
let p12base64 = Global.keychain[Global.kConfirmedP12Key]
+
+ if localId == nil || p12base64 == nil {
+ completion(NSError.init(domain: "Confirmed VPN", code: 1, userInfo: nil))
+ return
+ }
+
let p12Data = Data(base64Encoded: p12base64!)
ipsecManager?.loadFromPreferences(completionHandler: {(_ error: Error?) -> Void in
@@ -221,9 +227,14 @@ class IPSecV3: NSObject, ConfirmedVPNProtocol {
}
func getStatus(completion: @escaping (_ status: NEVPNStatus) -> Void) -> Void {
- self.ipsecManager?.loadFromPreferences(completionHandler: {(_ error: Error?) -> Void in
- completion(self.ipsecManager?.connection.status ?? .invalid)
- })
+ if self.ipsecManager == nil {
+ completion(.invalid)
+ }
+ else {
+ self.ipsecManager?.loadFromPreferences(completionHandler: {(_ error: Error?) -> Void in
+ completion(self.ipsecManager?.connection.status ?? .invalid)
+ })
+ }
}
var ipsecManager: NEVPNManager?
diff --git a/ConfirmediOS/Info.plist b/ConfirmediOS/Info.plist
index 6ca1e0c..27662c5 100644
--- a/ConfirmediOS/Info.plist
+++ b/ConfirmediOS/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.3.2
+ 1.3.3
CFBundleURLTypes
@@ -34,7 +34,7 @@
CFBundleVersion
- 14
+ 2
LSRequiresIPhoneOS
NSLocationAlwaysUsageDescription
diff --git a/ConfirmediOS/VPNViewController.swift b/ConfirmediOS/VPNViewController.swift
index ec07f3a..bd27a16 100644
--- a/ConfirmediOS/VPNViewController.swift
+++ b/ConfirmediOS/VPNViewController.swift
@@ -184,7 +184,6 @@ class VPNViewController: ConfirmedBaseViewController, BWWalkthroughViewControlle
self.vpnPowerButton?.isEnabled = true
}
- TunnelsSubscription.refreshAndUploadReceipt()
}
func updateActiveCountry() {
diff --git a/Today/Info.plist b/Today/Info.plist
index e6fa524..0bbdaf0 100644
--- a/Today/Info.plist
+++ b/Today/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 1.3.2
+ 1.3.3
CFBundleVersion
- 14
+ 2
NSExtension
NSExtensionMainStoryboard