From 05c6ace38980c786c2b5cdff29db880831e77de8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 3 Feb 2019 18:38:56 +0000
Subject: [PATCH] Confirm opening links for web view

---
 .../eu/faircode/email/AdapterMessage.java     | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9c98c91b6b..7a536e0a0e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1290,7 +1290,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             webView.setWebViewClient(new WebViewClient() {
                 public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                    Helper.view(context, owner, Uri.parse(url), true);
+                    onOpenLink(Uri.parse(url));
                     return true;
                 }
             });
@@ -1585,42 +1585,45 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 if (link.length != 0) {
                     String url = link[0].getURL();
                     Uri uri = Uri.parse(url);
-
-                    if (BuildConfig.APPLICATION_ID.equals(uri.getHost()) && "/activate/".equals(uri.getPath())) {
-                        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-                        lbm.sendBroadcast(
-                                new Intent(ActivityView.ACTION_ACTIVATE_PRO)
-                                        .putExtra("uri", uri));
-
-                    } else {
-                        View view = LayoutInflater.from(context).inflate(R.layout.dialog_link, null);
-                        final EditText etLink = view.findViewById(R.id.etLink);
-                        etLink.setText(url);
-                        new DialogBuilderLifecycle(context, owner)
-                                .setView(view)
-                                .setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        Uri uri = Uri.parse(etLink.getText().toString());
-                                        Helper.view(context, owner, uri, false);
-                                    }
-                                })
-                                .setNeutralButton(R.string.title_browse, new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        Uri uri = Uri.parse(etLink.getText().toString());
-                                        Helper.view(context, owner, uri, true);
-                                    }
-                                })
-                                .setNegativeButton(R.string.title_no, null)
-                                .show();
-                    }
+                    onOpenLink(uri);
                 }
 
                 return true;
             }
         }
 
+        private void onOpenLink(Uri uri) {
+            if (BuildConfig.APPLICATION_ID.equals(uri.getHost()) && "/activate/".equals(uri.getPath())) {
+                LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
+                lbm.sendBroadcast(
+                        new Intent(ActivityView.ACTION_ACTIVATE_PRO)
+                                .putExtra("uri", uri));
+            } else {
+                View view = LayoutInflater.from(context).inflate(R.layout.dialog_link, null);
+                final EditText etLink = view.findViewById(R.id.etLink);
+                etLink.setText(uri.toString());
+                new DialogBuilderLifecycle(context, owner)
+                        .setView(view)
+                        .setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Uri uri = Uri.parse(etLink.getText().toString());
+                                Helper.view(context, owner, uri, false);
+                            }
+                        })
+                        .setNeutralButton(R.string.title_browse, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Uri uri = Uri.parse(etLink.getText().toString());
+                                Helper.view(context, owner, uri, true);
+                            }
+                        })
+                        .setNegativeButton(R.string.title_no, null)
+                        .show();
+            }
+
+        }
+
         private class ActionData {
             boolean hasJunk;
             boolean delete;