Version 1.0.0 (33)

AppCheck.xcodeproj/project.pbxproj

@@ -1397,7 +1397,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = main/main.entitlements;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 33;
 				INFOPLIST_FILE = main/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1416,7 +1416,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = main/main.entitlements;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 33;
 				INFOPLIST_FILE = main/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1435,7 +1435,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GlassVPN/GlassVPN.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 33;
 				INFOPLIST_FILE = GlassVPN/Info.plist;
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.uni-bamberg.psi.AppCheck.VPN";
@@ -1453,7 +1453,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GlassVPN/GlassVPN.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 33;
 				INFOPLIST_FILE = GlassVPN/Info.plist;
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.uni-bamberg.psi.AppCheck.VPN";

GlassVPN/PacketTunnelProvider.swift

@@ -1,5 +1,6 @@
 import NetworkExtension
 
+let connectMessage: Data = "CONNECT".data(using: .ascii)!
 let swcdUserAgent: Data = "User-Agent: swcd".data(using: .ascii)!
 fileprivate var hook : GlassVPNHook!
 
@@ -25,7 +26,9 @@ class LDObserverFactory: ObserverFactory {
 				let kill = hook.processDNSRequest(session.host)
 				if kill { socket.forceDisconnect() }
 			case .readData(let data, on: let socket):
-				if hook.forceDisconnectSWCD, data.range(of: swcdUserAgent) != nil {
+				if hook.forceDisconnectSWCD,
+					data.starts(with: connectMessage),
+					data.range(of: swcdUserAgent) != nil {
 					socket.disconnect()
 				}
 			default:

main/Common Classes/PrefsShared.swift

@@ -12,6 +12,7 @@ enum PrefsShared {
 	
 	static func registerDefaults() {
 		suite.register(defaults: [
+			"ForceDisconnectSWCD" : true,
 			"RestartReminderEnabled" : true,
 			"RestartReminderWithText" : true,
 			"RestartReminderWithBadge" : true,

main/GUI/Base.lproj/Settings.storyboard

@@ -291,8 +291,8 @@
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="User-Agent: swcd (may affect performance)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n7p-Ab-69G">
-                                                    <rect key="frame" x="16" y="25.5" width="249.5" height="14.5"/>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="background deamon User-Agent: swcd" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n7p-Ab-69G">
+                                                    <rect key="frame" x="16" y="25.5" width="220.5" height="14.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
@@ -434,7 +434,7 @@ If App Badge is enabled, display the letter "1" on the homescreen app icon, as l
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="zaV-mh-eqb">
-                                                    <rect key="frame" x="251" y="6" width="54" height="31"/>
+                                                    <rect key="frame" x="250" y="6" width="54" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="toggleAllowRestartReminder:" destination="JYM-cs-i4H" eventType="valueChanged" id="F4e-k2-bni"/>
@@ -461,7 +461,7 @@ If App Badge is enabled, display the letter "1" on the homescreen app icon, as l
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="HaE-En-NH3">
-                                                    <rect key="frame" x="251" y="6" width="54" height="31"/>
+                                                    <rect key="frame" x="250" y="6" width="54" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="toggleAllowRestartNotify:" destination="JYM-cs-i4H" eventType="valueChanged" id="12C-h5-mrR"/>
@@ -488,7 +488,7 @@ If App Badge is enabled, display the letter "1" on the homescreen app icon, as l
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="N2Q-cU-pkd">
-                                                    <rect key="frame" x="251" y="6" width="54" height="31"/>
+                                                    <rect key="frame" x="250" y="6" width="54" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="toggleAllowRestartBadge:" destination="JYM-cs-i4H" eventType="valueChanged" id="76l-6y-fOu"/>

main/GlassVPNHook.swift

@@ -152,13 +152,12 @@ class GlassVPNHook {
 	@objc private func autoDeleteNow(_ sender: Timer) {
 		NSLog("[VPN.INFO] Auto-delete old logs")
 		queue.async {
+			guard sender.isValid else { return }
 			do {
 				try AppDB?.dnsLogsDeleteOlderThan(days: sender.userInfo as! Int)
 			} catch {
 				NSLog("[VPN.WARN] Couldn't delete logs, will retry in 5 minutes. \(error)")
-				if sender.isValid {
-					sender.fireDate = Date().addingTimeInterval(300) // retry in 5 min
-				}
+				sender.fireDate = Date().addingTimeInterval(300) // retry in 5 min
 			}
 		}
 	}

main/Recordings/VCEditRecording.swift

@@ -20,9 +20,12 @@ class VCEditRecording: UIViewController, UITextFieldDelegate, UITextViewDelegate
 	
 	override func viewDidLoad() {
 		if deleteOnCancel { // aka newly created
-			RecordingsDB.persist(record)
-			if Prefs.RecordingReminder.Enabled {
-				PushNotification.scheduleRecordingReminder(force: true)
+			let r = record!
+			DispatchQueue.global().async {
+				RecordingsDB.persist(r)
+				if Prefs.RecordingReminder.Enabled {
+					PushNotification.scheduleRecordingReminder(force: true)
+				}
 			}
 			buttonFilter.isHidden = true
 			// mark as destructive