- Made some media mimetypes unsupported because WKWebview does not su…

…pport them. (wmv, ogg, avi, flv) - Made some image mimetypes to open inside WKWebView (svg, gif)
owncloud · Oct 23, 2018 · a6f2421 · a6f2421
1 parent 7302ae8
commit a6f2421
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ownCloud/Viewer/ImageDisplayViewController.swift b/ownCloud/Viewer/ImageDisplayViewController.swift
@@ -48,7 +48,7 @@ extension ImageDisplayViewController: DisplayExtension {
 	static var customMatcher: OCExtensionCustomContextMatcher? = { (context, defaultPriority) in
 		do {
 			let location = context!.location.identifier.rawValue
-			let supportedFormatsRegex = try NSRegularExpression(pattern: "\\A((image/))", options: .caseInsensitive)
+			let supportedFormatsRegex = try NSRegularExpression(pattern: "\\A((image/(?!(gif|svg*))))", options: .caseInsensitive)
 			let matches = supportedFormatsRegex.numberOfMatches(in: location, options: .reportCompletion, range: NSRange(location: 0, length: location.count))
 
 			if matches > 0 {

diff --git a/ownCloud/Viewer/WebViewDisplayViewController.swift b/ownCloud/Viewer/WebViewDisplayViewController.swift
@@ -110,7 +110,7 @@ extension WebViewDisplayViewController: DisplayExtension {
 	static var customMatcher: OCExtensionCustomContextMatcher? = { (context, defaultPriority) in
 		do {
 			let location = context!.location.identifier.rawValue
-			let supportedFormatsRegex = try NSRegularExpression(pattern: "\\A((text/)|(video/)|(audio/)|(application/(vnd.|ms))(ms|openxmlformats)?)", options: .caseInsensitive)
+			let supportedFormatsRegex = try NSRegularExpression(pattern: "\\A((text/)|(video/(?!(x-flv|ogg|x-ms-wmv|x-msvideo)))|(audio/)|(image/(gif|svg))|(application/(vnd.|ms))(?!oasis)(ms|openxmlformats)?)", options: .caseInsensitive)
 			let matches = supportedFormatsRegex.numberOfMatches(in: location, options: .reportCompletion, range: NSRange(location: 0, length: location.count))
 
 			if matches > 0 {