Merge pull request #518 from brave/longpress-prompt

Only show unsupported prompt for link content
brave · Aug 14, 2015 · ea3e537 · ea3e537
2 parents da9c254 + c49854a
commit ea3e537
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Application/LinkBubble/src/main/assets/test.html b/Application/LinkBubble/src/main/assets/test.html
@@ -162,6 +162,7 @@ <h3>HTML tests</h3>
 <button onclick="onNewTab()">Open URL in new tab</button><br><br>
 Click <a href="#" onclick="javascript:window.open('','_self').close();">HERE</a> to close the current tab<br><br>
 
+
 <form action="">
 <select name="cars">
 <option value="volvo">Volvo</option>
@@ -201,7 +202,9 @@ <h3>HTML tests</h3>
 <a href="mailto:webmaster@example.com">Email test</a><br>
 <a href="tel:5551234567">Call (555)123-4567</a><br>
 <a href="callto:5551234567">Call (555)123-4567 [SKYPE]</a><br>
-<a href="im:username@gtalk.com">IM</a> (unsupported)<br><br><br>
+<a href="im:username@gtalk.com">IM</a> (unsupported)<br>
+<a href="javascript:window.open('http://www.linkbubble.com');">JavaScript URL</a><br>
+<br><br>
 
 <p>Percent encoded image, long press -> save image</p>
 <img height="100" width="100" src="data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%0A%00%00%00%0A%08%02%00%00%00%02PX%EA%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%03%24iTXtXML%3Acom.adobe.xmp%00%00%00%00%00%3C%3Fxpacket%20begin%3D%22%EF%BB%BF%22%20id%3D%22W5M0MpCehiHzreSzNTczkc9d%22%3F%3E%20%3Cx%3Axmpmeta%20xmlns%3Ax%3D%22adobe%3Ans%3Ameta%2F%22%20x%3Axmptk%3D%22Adobe%20XMP%20Core%205.3-c011%2066.145661%2C%202012%2F02%2F06-14%3A56%3A27%20%20%20%20%20%20%20%20%22%3E%20%3Crdf%3ARDF%20xmlns%3Ardf%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%22%3E%20%3Crdf%3ADescription%20rdf%3Aabout%3D%22%22%20xmlns%3Axmp%3D%22http%3A%2F%2Fns.adobe.com%2Fxap%2F1.0%2F%22%20xmlns%3AxmpMM%3D%22http%3A%2F%2Fns.adobe.com%2Fxap%2F1.0%2Fmm%2F%22%20xmlns%3AstRef%3D%22http%3A%2F%2Fns.adobe.com%2Fxap%2F1.0%2FsType%2FResourceRef%23%22%20xmp%3ACreatorTool%3D%22Adobe%20Photoshop%20CS6%20%28Macintosh%29%22%20xmpMM%3AInstanceID%3D%22xmp.iid%3AECBA5D79397D11E5BD3CFC26E00B9326%22%20xmpMM%3ADocumentID%3D%22xmp.did%3AECBA5D7A397D11E5BD3CFC26E00B9326%22%3E%20%3CxmpMM%3ADerivedFrom%20stRef%3AinstanceID%3D%22xmp.iid%3AECBA5D77397D11E5BD3CFC26E00B9326%22%20stRef%3AdocumentID%3D%22xmp.did%3AECBA5D78397D11E5BD3CFC26E00B9326%22%2F%3E%20%3C%2Frdf%3ADescription%3E%20%3C%2Frdf%3ARDF%3E%20%3C%2Fx%3Axmpmeta%3E%20%3C%3Fxpacket%20end%3D%22r%22%3F%3E%FA%15%14%02%00%00%00%15IDATx%DAb%FC%CF%80%0F01%8CJc%01%00%01%06%00A%2C%01%13n%CF%E7%B5%00%00%00%00IEND%AEB%60%82">

diff --git a/Application/LinkBubble/src/main/java/com/linkbubble/webrender/WebViewRenderer.java b/Application/LinkBubble/src/main/java/com/linkbubble/webrender/WebViewRenderer.java
@@ -9,6 +9,7 @@
 import android.net.ConnectivityManager;
 import android.net.http.SslError;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
@@ -370,7 +371,17 @@ public boolean onLongClick(View v) {
                 case WebView.HitTestResult.UNKNOWN_TYPE:
                 default:
                     if (Constant.ACTIVITY_WEBVIEW_RENDERING == false) {
-                        mController.onShowBrowserPrompt();
+                        Message msg = new Message();
+                        msg.setTarget(new Handler() {
+                            @Override
+                            public void handleMessage(Message msg) {
+                                Bundle b = msg.getData();
+                                if (b != null && b.getString("url") != null) {
+                                    mController.onShowBrowserPrompt();
+                                }
+                            }
+                        });
+                        mWebView.requestFocusNodeHref(msg);
                     }
                     return false;
             }