Fix bug where ? was left when no params were leftover

rknightuk · Sep 4, 2021 · e9e9a7d · devnoname120 · Feb 3, 2022 · e9e9a7d
1 parent 3f11f36
commit e9e9a7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/TrackerZapper.xcodeproj/project.pbxproj b/TrackerZapper.xcodeproj/project.pbxproj
@@ -297,7 +297,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rknightuk.TrackerZapper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -323,7 +323,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rknightuk.TrackerZapper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/robb.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/robb.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TrackerZapper/AppDelegate.swift b/TrackerZapper/AppDelegate.swift
@@ -184,7 +184,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     params = params.filter { !$0.starts(with: r)}
                 }
                 let joinedParams = params.joined(separator: "&")
-                let formattedUrl = "\(urlParts[0])?\(joinedParams)"
+                print(joinedParams)
+                var formattedUrl = "\(urlParts[0])?\(joinedParams)"
+                if (joinedParams == "")
+                {
+                    formattedUrl = urlParts[0]
+                }
                 formatted = formatted.replacingOccurrences(of: url, with: formattedUrl)
             }
         }