Fix PDF's no longer opening inline

joelekstrom · Jan 26, 2021 · 8567791 · 8567791
1 parent 8f24f15
commit 8567791
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 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.3;
+				MARKETING_VERSION = 1.6.4;
 				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.3;
+				MARKETING_VERSION = 1.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.ekstrom.Fastmate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/Fastmate/WebViewController.m b/Fastmate/WebViewController.m
@@ -89,7 +89,17 @@ - (BOOL)isDownloadRequest:(NSURLRequest *)request
     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/"];
+
+    if (hasDownloadQueryItem) {
+        return YES;
+    }
+
+    // We want to display PDF's inline if it wasn't a specific request for download
+    if ([components.path hasSuffix:@".pdf"]) {
+        return NO;
+    }
+
+    return [components.path hasPrefix:@"/jmap/download/"];
 }
 
 - (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures {