From 2753248c2f98f904fa4bcba017f4b2b4c80daef3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 3 Jan 2019 11:46:32 +0100
Subject: [PATCH] Confirm inserting links from clipboard

---
 .../eu/faircode/email/FragmentCompose.java    | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f8d6bf1e18..d20ce98285 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -610,33 +610,30 @@ public class FragmentCompose extends FragmentEx {
                             uri = null;
                     }
 
-                    if (uri == null) {
-                        View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_link, null);
-                        final int fStart = start;
-                        final int fEnd = end;
-                        final EditText etLink = view.findViewById(R.id.etLink);
-                        etLink.setText("https://");
-                        new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                                .setView(view)
-                                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        s.setSpan(new URLSpan(etLink.getText().toString()), fStart, fEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                                        etBody.setText(s);
-                                        etBody.setSelection(fEnd);
-                                    }
-                                })
-                                .show();
-                        new Handler().post(new Runnable() {
-                            @Override
-                            public void run() {
-                                etLink.requestFocus();
-                            }
-                        });
-                        return;
-                    } else
-                        s.setSpan(new URLSpan(uri.toString()), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    break;
+                    View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_link, null);
+                    final int fStart = start;
+                    final int fEnd = end;
+                    final EditText etLink = view.findViewById(R.id.etLink);
+                    etLink.setText(uri == null ? "https://" : uri.toString());
+                    new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
+                            .setView(view)
+                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    s.setSpan(new URLSpan(etLink.getText().toString()), fStart, fEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                    etBody.setText(s);
+                                    etBody.setSelection(fEnd);
+                                }
+                            })
+                            .show();
+                    new Handler().post(new Runnable() {
+                        @Override
+                        public void run() {
+                            etLink.requestFocus();
+                        }
+                    });
+
+                    return;
             }
 
             etBody.setText(s);