From ceb00f7d916ea77deb7c06cd3f2181b14c0f719b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 14 Nov 2020 14:27:53 +0100
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/ActivityCompose.java | 2 +-
 app/src/main/java/eu/faircode/email/IPInfo.java          | 5 +++--
 app/src/main/java/eu/faircode/email/MessageHelper.java   | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 415df36fab..c2bbeb4ae0 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -87,7 +87,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
             args.putLong("account", -1);
 
             Uri uri = intent.getData();
-            if (uri != null && "mailto".equals(uri.getScheme())) {
+            if (uri != null && "mailto".equalsIgnoreCase(uri.getScheme())) {
                 // https://www.ietf.org/rfc/rfc2368.txt
                 MailTo mailto = MailTo.parse(uri.toString());
 
diff --git a/app/src/main/java/eu/faircode/email/IPInfo.java b/app/src/main/java/eu/faircode/email/IPInfo.java
index 3958ef4b32..31b23d6b28 100644
--- a/app/src/main/java/eu/faircode/email/IPInfo.java
+++ b/app/src/main/java/eu/faircode/email/IPInfo.java
@@ -24,6 +24,7 @@ import android.net.ParseException;
 import android.net.Uri;
 import android.util.Pair;
 
+import androidx.annotation.NonNull;
 import androidx.core.net.MailTo;
 
 import java.io.IOException;
@@ -41,8 +42,8 @@ public class IPInfo {
 
     private final static int FETCH_TIMEOUT = 15 * 1000; // milliseconds
 
-    static Pair<String, Organization> getOrganization(Uri uri, Context context) throws IOException, ParseException {
-        if ("mailto".equals(uri.getScheme())) {
+    static Pair<String, Organization> getOrganization(@NonNull Uri uri, Context context) throws IOException, ParseException {
+        if ("mailto".equalsIgnoreCase(uri.getScheme())) {
             MailTo email = MailTo.parse(uri.toString());
             String to = email.getTo();
             if (to == null || !to.contains("@"))
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index b24b6a9071..536f1ae3e7 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1282,6 +1282,8 @@ public class MessageHelper {
                     String unsubscribe = entry.substring(lt + 1, gt);
                     Uri uri = Uri.parse(unsubscribe);
                     String scheme = uri.getScheme();
+                    if (scheme != null)
+                        scheme = scheme.toLowerCase(Locale.ROOT);
                     if (mailto == null && "mailto".equals(scheme))
                         mailto = unsubscribe;
                     if (link == null && ("http".equals(scheme) || "https".equals(scheme)))