Fix broken "download all attachments"-link

Fixes #29
joelekstrom · Jan 17, 2021 · 8f24f15 · 8f24f15
1 parent 3216b3e
commit 8f24f15
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Fastmate.xcodeproj/project.pbxproj b/Fastmate.xcodeproj/project.pbxproj
@@ -341,7 +341,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.6.2;
+				MARKETING_VERSION = 1.6.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.ekstrom.Fastmate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -364,7 +364,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.6.2;
+				MARKETING_VERSION = 1.6.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.ekstrom.Fastmate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/Fastmate/WebViewController.m b/Fastmate/WebViewController.m
@@ -65,11 +65,7 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
         decisionHandler(WKNavigationActionPolicyCancel);
         self.temporaryWebView = nil;
     } else if ([navigationAction.request.URL.host hasSuffix:@".fastmailusercontent.com"]) {
-        NSURLComponents *components = [NSURLComponents componentsWithURL:navigationAction.request.URL resolvingAgainstBaseURL:NO];
-        BOOL shouldDownload = [components.queryItems indexOfObjectPassingTest:^BOOL(NSURLQueryItem *item, NSUInteger index, BOOL *stop) {
-            return [item.name isEqualToString:@"download"] && [item.value isEqualToString:@"1"];
-        }] != NSNotFound;
-        if (shouldDownload) {
+        if ([self isDownloadRequest:navigationAction.request]) {
             [NSWorkspace.sharedWorkspace openURL:navigationAction.request.URL];
             decisionHandler(WKNavigationActionPolicyCancel);
         } else {
@@ -84,6 +80,18 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
     }
 }
 
+/**
+ YES if request is to download a fastmail-hosted file
+ */
+- (BOOL)isDownloadRequest:(NSURLRequest *)request
+{
+    NSURLComponents *components = [NSURLComponents componentsWithURL:request.URL resolvingAgainstBaseURL:NO];
+    BOOL hasDownloadQueryItem = [components.queryItems indexOfObjectPassingTest:^BOOL(NSURLQueryItem *item, NSUInteger index, BOOL *stop) {
+        return [item.name isEqualToString:@"download"] && [item.value isEqualToString:@"1"];
+    }] != NSNotFound;
+    return hasDownloadQueryItem || [components.path hasPrefix:@"/jmap/download/"];
+}
+
 - (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures {
     self.temporaryWebView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:configuration];
     self.temporaryWebView.navigationDelegate = self;