From 4d186bba671e319e4df1ac330e60c23385455d52 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 4 Apr 2020 18:28:31 +0200
Subject: [PATCH] Allow using title uri

---
 .../eu/faircode/email/AdapterMessage.java     | 66 +++++++++--------
 app/src/main/res/layout/dialog_open_link.xml  | 72 ++++++++++++-------
 2 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a2eec4c70e..a5c738c433 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5229,12 +5229,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 sanitized = (changed ? builder.build() : uri);
             }
 
+            final Uri uriTitle = Uri.parse(title == null ? "" : title);
+
             View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_open_link, null);
             TextView tvTitle = dview.findViewById(R.id.tvTitle);
+            final EditText etLink = dview.findViewById(R.id.etLink);
             ImageButton ibShare = dview.findViewById(R.id.ibShare);
             ImageButton ibCopy = dview.findViewById(R.id.ibCopy);
-            final EditText etLink = dview.findViewById(R.id.etLink);
             TextView tvDifferent = dview.findViewById(R.id.tvDifferent);
+            ImageButton ibDifferent = dview.findViewById(R.id.ibDifferent);
             final CheckBox cbSecure = dview.findViewById(R.id.cbSecure);
             CheckBox cbSanitize = dview.findViewById(R.id.cbSanitize);
             final Button btnOwner = dview.findViewById(R.id.btnOwner);
@@ -5242,33 +5245,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
             final TextView tvHost = dview.findViewById(R.id.tvHost);
             final TextView tvOwner = dview.findViewById(R.id.tvOwner);
+            final Group grpDifferent = dview.findViewById(R.id.grpDifferent);
             final Group grpOwner = dview.findViewById(R.id.grpOwner);
 
-            ibShare.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent send = new Intent();
-                    send.setAction(Intent.ACTION_SEND);
-                    send.putExtra(Intent.EXTRA_TEXT, uri.toString());
-                    send.setType("text/plain");
-                    startActivity(Intent.createChooser(send, title));
-                }
-            });
-
-            ibCopy.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    ClipboardManager clipboard =
-                            (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                    if (clipboard != null) {
-                        ClipData clip = ClipData.newPlainText(title, uri.toString());
-                        clipboard.setPrimaryClip(clip);
-
-                        ToastEx.makeText(getContext(), R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
-                    }
-                }
-            });
-
             etLink.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -5301,6 +5280,38 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
             });
 
+            ibShare.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent send = new Intent();
+                    send.setAction(Intent.ACTION_SEND);
+                    send.putExtra(Intent.EXTRA_TEXT, etLink.getText().toString());
+                    send.setType("text/plain");
+                    startActivity(Intent.createChooser(send, title));
+                }
+            });
+
+            ibCopy.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    ClipboardManager clipboard =
+                            (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                    if (clipboard != null) {
+                        ClipData clip = ClipData.newPlainText(title, etLink.getText().toString());
+                        clipboard.setPrimaryClip(clip);
+
+                        ToastEx.makeText(getContext(), R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
+                    }
+                }
+            });
+
+            ibDifferent.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    etLink.setText(uriTitle.toString());
+                }
+            });
+
             cbSecure.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -5392,8 +5403,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvTitle.setVisibility(TextUtils.isEmpty(title) ? View.GONE : View.VISIBLE);
             etLink.setText(uri.toString());
 
-            Uri uriTitle = Uri.parse(title == null ? "" : title);
-            tvDifferent.setVisibility(uriTitle.getHost() == null || uri.getHost() == null ||
+            grpDifferent.setVisibility(uriTitle.getHost() == null || uri.getHost() == null ||
                     uriTitle.getHost().equalsIgnoreCase(uri.getHost())
                     ? View.GONE : View.VISIBLE);
 
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 9d14d165d6..af7b8cde44 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -28,31 +28,10 @@
             android:text="Link title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textStyle="italic"
-            app:layout_constraintEnd_toStartOf="@+id/ibShare"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <ImageButton
-            android:id="@+id/ibShare"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_share"
-            app:layout_constraintBottom_toBottomOf="@id/tvTitle"
-            app:layout_constraintEnd_toStartOf="@+id/ibCopy"
-            app:srcCompat="@drawable/baseline_share_24" />
-
-        <ImageButton
-            android:id="@+id/ibCopy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_clipboard_copy"
-            app:layout_constraintBottom_toBottomOf="@id/tvTitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/baseline_assignment_24" />
-
         <eu.faircode.email.EditTextPlain
             android:id="@+id/etLink"
             android:layout_width="0dp"
@@ -66,17 +45,50 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle" />
 
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvDifferent"
+        <ImageButton
+            android:id="@+id/ibShare"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginEnd="12dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_share"
+            app:layout_constraintEnd_toStartOf="@+id/ibCopy"
+            app:layout_constraintTop_toBottomOf="@id/etLink"
+            app:srcCompat="@drawable/baseline_share_24" />
+
+        <ImageButton
+            android:id="@+id/ibCopy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_clipboard_copy"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etLink"
+            app:srcCompat="@drawable/baseline_assignment_24" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvDifferent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="12dp"
             android:text="@string/title_different_link"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
             android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@+id/ibDifferent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etLink" />
+            app:layout_constraintTop_toBottomOf="@id/ibCopy" />
+
+        <ImageButton
+            android:id="@+id/ibDifferent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_clipboard_copy"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tvDifferent"
+            app:srcCompat="@drawable/baseline_insert_link_24" />
 
         <CheckBox
             android:id="@+id/cbSecure"
@@ -87,7 +99,7 @@
             android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvDifferent" />
+            app:layout_constraintTop_toBottomOf="@id/ibDifferent" />
 
         <CheckBox
             android:id="@+id/cbSanitize"
@@ -159,6 +171,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvHost" />
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/grpDifferent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:constraint_referenced_ids="tvDifferent,ibDifferent" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpOwner"
             android:layout_width="0dp"