Crash fix, UI glitch fix, and rolling back OVPN

confirmedcode · May 16, 2019 · d7ac927 · d7ac927
1 parent e019131
commit d7ac927
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/Confirmed Blocker/Info.plist b/Confirmed Blocker/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/Confirmed Tunnels/Info.plist b/Confirmed Tunnels/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git 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
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationAlwaysUsageDescription</key>

diff --git 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
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>