From 46f74bd11cbfe42b688bcd53a609c5ca751d270f Mon Sep 17 00:00:00 2001
From: m0viefreak <m0viefreak.cm@googlemail.com>
Date: Thu, 26 Mar 2015 02:17:48 +0100
Subject: [PATCH] WebView: Open links in external Browser

1a20ca06f1ef8ab0d4a5952dcc614973014b50c7 connected a WebViewClient
to the WebView. But as soon as a client is connected, the WebView
stops handling links itself and tries to display everything on
its own.

Override shouldOverrideUrlLoading() and replicate what Android's
default WebView does if no WebViewClient is connected to work
around this.

This fixes #587.
---
 .../com/fsck/k9/view/K9WebViewClient.java     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/k9mail/src/main/java/com/fsck/k9/view/K9WebViewClient.java b/k9mail/src/main/java/com/fsck/k9/view/K9WebViewClient.java
index a52c64f5d..3b96ab8c4 100644
--- a/k9mail/src/main/java/com/fsck/k9/view/K9WebViewClient.java
+++ b/k9mail/src/main/java/com/fsck/k9/view/K9WebViewClient.java
@@ -5,11 +5,14 @@ import java.io.InputStream;
 import java.util.Stack;
 
 import android.annotation.TargetApi;
+import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
+import android.provider.Browser;
 import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.WebResourceRequest;
@@ -48,6 +51,30 @@ public abstract class K9WebViewClient extends WebViewClient {
         this.part = part;
     }
 
+    @Override
+    public boolean shouldOverrideUrlLoading(WebView webView, String url) {
+        Context context = webView.getContext();
+        Uri uri = Uri.parse(url);
+        if (!CID_SCHEME.equals(uri.getScheme())) {
+            // Replicate Android 4 android.webkit.CallbackProxy.uiOverrideUrlLoading()
+            // default behavior to open clicked links in external applications.
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            // If another application is running a WebView and launches the
+            // Browser through this Intent, we want to reuse the same window if
+            // possible.
+            intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
+            try {
+                context.startActivity(intent);
+                return true;
+            } catch (ActivityNotFoundException ex) {
+                // If no application can handle the URL, assume that the
+                // WebView can handle it.
+            }
+        }
+        return false;
+    }
+
     protected WebResourceResponse shouldInterceptRequest(WebView webView, Uri uri) {
         if (!CID_SCHEME.equals(uri.getScheme())) {
             return RESULT_DO_NOT_INTERCEPT;