Merge pull request #84 from InteractionEngineer/bugfix/nextcloud-subpath

fixed Cospend URL decoding for subdirectory Nextcloud instances, fixes #82

Author: InteractionEngineer

PayForMe.xcodeproj/project.pbxproj

@@ -804,7 +804,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5;
+				MARKETING_VERSION = 2.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = de.mayflower.PayForMe;
 				PRODUCT_NAME = PayForMe;
 				SWIFT_VERSION = 5.0;
@@ -829,7 +829,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5;
+				MARKETING_VERSION = 2.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = de.mayflower.PayForMe;
 				PRODUCT_NAME = PayForMe;
 				SWIFT_VERSION = 5.0;

PayForMe.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -190,15 +190,22 @@ extension URL {
     func decodeCospendString() -> ProjectData {
         guard let host = host,
               let scheme = scheme,
-              scheme.localizedCaseInsensitiveContains("cospend"),
-              pathComponents.count >= 2,
-              pathComponents.count <= 3
+              scheme.localizedCaseInsensitiveContains("cospend")
         else {
             return (nil, nil, nil)
         }
-        return (URL(string: "https://\(host)" + ((port != nil) ? ":\(port!)" :  "")),
-                pathComponents[1],
-                pathComponents[safe: 2])
+        
+        var hostString = "https://\(host)"
+        
+        if let port = port {hostString += ":\(port)"}
+        
+        if pathComponents.count > 3 {
+            hostString += "/" + pathComponents[1..<(pathComponents.count - 2)].joined(separator: "/")
+        }
+        
+        return (URL(string: hostString),
+                pathComponents[safe: pathComponents.count - 2],
+                pathComponents.last)
     }
 }