Don't attempt to open file: URIs in an email (18fa5057) · Commits · e / os / Mail

app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt

+8 −6

Original line number	Diff line number	Diff line
		@@ -144,12 +144,14 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :

		menu.setHeaderTitle(linkUrl)

		if (!linkUrl.startsWith("file:")) {
		menu.add(
		Menu.NONE,
		MENU_ITEM_LINK_VIEW,
		0,
		context.getString(R.string.webview_contextmenu_link_view_action),
		).setOnMenuItemClickListener(listener)
		}

		menu.add(
		Menu.NONE,

app/ui/legacy/src/main/java/com/fsck/k9/view/K9WebViewClient.kt

+28 −13

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ import android.webkit.WebView
		import android.webkit.WebViewClient
		import android.widget.Toast
		import androidx.annotation.RequiresApi
		import com.fsck.k9.helper.ClipboardManager
		import com.fsck.k9.logging.Timber
		import com.fsck.k9.mailstore.AttachmentResolver
		import com.fsck.k9.ui.R
		@@ -21,6 +22,7 @@ import com.fsck.k9.view.MessageWebView.OnPageFinishedListener
		* [WebViewClient] that intercepts requests for `cid:` URIs to load the respective body part.
		*/
		internal class K9WebViewClient(
		private val clipboardManager: ClipboardManager,
		private val attachmentResolver: AttachmentResolver?,
		private val onPageFinishedListener: OnPageFinishedListener?,
		) : WebViewClient() {
		@@ -36,29 +38,41 @@ internal class K9WebViewClient(
		}

		private fun shouldOverrideUrlLoading(webView: WebView, uri: Uri): Boolean {
		if (uri.scheme == CID_SCHEME) return false

		val context = webView.context
		val intent = createBrowserViewIntent(uri, context)

		try {
		context.startActivity(intent)
		} catch (e: ActivityNotFoundException) {
		Timber.d(e, "Couldn't open URL: %s", uri)
		Toast.makeText(context, R.string.error_activity_not_found, Toast.LENGTH_LONG).show()
		return when (uri.scheme) {
		CID_SCHEME -> {
		false
		}
		FILE_SCHEME -> {
		copyUrlToClipboard(webView.context, uri)
		true
		}
		else -> {
		openUrl(webView.context, uri)
		true
		}
		}
		}

		return true
		private fun copyUrlToClipboard(context: Context, uri: Uri) {
		val label = context.getString(R.string.webview_contextmenu_link_clipboard_label)
		clipboardManager.setText(label, uri.toString())
		}

		private fun createBrowserViewIntent(uri: Uri, context: Context): Intent {
		return Intent(Intent.ACTION_VIEW, uri).apply {
		private fun openUrl(context: Context, uri: Uri) {
		val intent = Intent(Intent.ACTION_VIEW, uri).apply {
		putExtra(Browser.EXTRA_APPLICATION_ID, context.packageName)
		putExtra(Browser.EXTRA_CREATE_NEW_TAB, true)

		addCategory(Intent.CATEGORY_BROWSABLE)
		addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT)
		}

		try {
		context.startActivity(intent)
		} catch (e: ActivityNotFoundException) {
		Timber.d(e, "Couldn't open URL: %s", uri)
		Toast.makeText(context, R.string.error_activity_not_found, Toast.LENGTH_LONG).show()
		}
		}

		override fun shouldInterceptRequest(webView: WebView, request: WebResourceRequest): WebResourceResponse? {
		@@ -108,6 +122,7 @@ internal class K9WebViewClient(

		companion object {
		private const val CID_SCHEME = "cid"
		private const val FILE_SCHEME = "file"

		private val RESULT_DO_NOT_INTERCEPT: WebResourceResponse? = null
		private val RESULT_DUMMY_RESPONSE = WebResourceResponse(null, null, null)

app/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ val viewModule = module {
		factory { ReplyToParser() }
		factory { ReplyActionStrategy(replyRoParser = get()) }
		factory { (attachmentResolver: AttachmentResolver?, onPageFinishedListener: OnPageFinishedListener?) ->
		K9WebViewClient(attachmentResolver, onPageFinishedListener)
		K9WebViewClient(clipboardManager = get(), attachmentResolver, onPageFinishedListener)
		}
		factory { WebViewClientFactory() }
		}