From ceea8cd1f8c3deeb17655d453ef814ecace41fab Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 10 Aug 2020 20:43:00 +0200
Subject: [PATCH] Behavior improvement

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7c8e77d7c7..4a6ef6e9ee 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5870,17 +5870,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         return;
 
                     Uri uri = Uri.parse(etLink.getText().toString());
-                    Uri.Builder builder = uri.buildUpon();
-
-                    builder.scheme(checked ? "https" : "http");
-
-                    String authority = uri.getEncodedAuthority();
-                    if (authority != null) {
-                        authority = authority.replace(checked ? ":80" : ":443", checked ? ":443" : ":80");
-                        builder.encodedAuthority(authority);
-                    }
-
-                    etLink.setText(builder.build().toString());
+                    etLink.setText(secure(uri, checked).toString());
                 }
             });
 
@@ -5889,10 +5879,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             cbSanitize.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                    if (checked)
-                        etLink.setText(sanitized.toString());
-                    else
-                        etLink.setText(uri.toString());
+                    etLink.setText(secure(checked ? sanitized : uri, cbSecure.isChecked()).toString());
                 }
             });
 
@@ -6065,6 +6052,23 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             return (changed ? builder.build() : null);
         }
+
+        private static Uri secure(Uri uri, boolean https) {
+            String scheme = uri.getScheme();
+            if (https ? "http".equals(scheme) : "https".equals(scheme)) {
+                Uri.Builder builder = uri.buildUpon();
+                builder.scheme(https ? "https" : "http");
+
+                String authority = uri.getEncodedAuthority();
+                if (authority != null) {
+                    authority = authority.replace(https ? ":80" : ":443", https ? ":443" : ":80");
+                    builder.encodedAuthority(authority);
+                }
+
+                return builder.build();
+            } else
+                return uri;
+        }
     }
 
     public static class FragmentDialogJunk extends FragmentDialogBase {