From 93f891b9684a2695eef8e3912766e9b506e52b3d Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 8 Apr 2022 16:25:54 +0200 Subject: [PATCH] Revert "Workaround invalid percent encoding" This reverts commit 79b20937e798c2d2fbb2f6ac568d89a2ebbd03c6. --- .../eu/faircode/email/ActivityCompose.java | 1 + .../java/eu/faircode/email/DnsBlockList.java | 1 + .../email/FragmentDialogOpenLink.java | 1 + .../main/java/eu/faircode/email/IPInfo.java | 1 + .../main/java/eu/faircode/email/MailTo.java | 88 ------------------- .../java/eu/faircode/email/MessageHelper.java | 1 + 6 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 app/src/main/java/eu/faircode/email/MailTo.java diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java index b5fbc9c461..67420e8e18 100644 --- a/app/src/main/java/eu/faircode/email/ActivityCompose.java +++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java @@ -30,6 +30,7 @@ import android.text.Spanned; import android.text.TextUtils; import androidx.core.app.TaskStackBuilder; +import androidx.core.net.MailTo; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; diff --git a/app/src/main/java/eu/faircode/email/DnsBlockList.java b/app/src/main/java/eu/faircode/email/DnsBlockList.java index bb93106aa7..03430ae105 100644 --- a/app/src/main/java/eu/faircode/email/DnsBlockList.java +++ b/app/src/main/java/eu/faircode/email/DnsBlockList.java @@ -24,6 +24,7 @@ import android.content.SharedPreferences; import android.net.Uri; import android.text.TextUtils; +import androidx.core.net.MailTo; import androidx.preference.PreferenceManager; import java.net.Inet4Address; diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java index 71fe8b7e6c..d12d33e7a0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java @@ -58,6 +58,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.constraintlayout.widget.Group; +import androidx.core.net.MailTo; import androidx.core.util.PatternsCompat; import androidx.lifecycle.Lifecycle; import androidx.localbroadcastmanager.content.LocalBroadcastManager; diff --git a/app/src/main/java/eu/faircode/email/IPInfo.java b/app/src/main/java/eu/faircode/email/IPInfo.java index d6b2e17238..db8193db3c 100644 --- a/app/src/main/java/eu/faircode/email/IPInfo.java +++ b/app/src/main/java/eu/faircode/email/IPInfo.java @@ -25,6 +25,7 @@ import android.net.Uri; import android.util.Pair; import androidx.annotation.NonNull; +import androidx.core.net.MailTo; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/app/src/main/java/eu/faircode/email/MailTo.java b/app/src/main/java/eu/faircode/email/MailTo.java deleted file mode 100644 index fcd295c27e..0000000000 --- a/app/src/main/java/eu/faircode/email/MailTo.java +++ /dev/null @@ -1,88 +0,0 @@ -package eu.faircode.email; - -/* - This file is part of FairEmail. - - FairEmail is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - FairEmail is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with FairEmail. If not, see . - - Copyright 2018-2022 by Marcel Bokhorst (M66B) -*/ - -import android.net.Uri; - -import androidx.annotation.NonNull; -import androidx.core.net.ParseException; - -import java.util.Map; - -public class MailTo { - private final androidx.core.net.MailTo instance; - - // https://en.wikipedia.org/wiki/Mailto - private MailTo(androidx.core.net.MailTo instance) { - this.instance = instance; - } - - @NonNull - public static MailTo parse(@NonNull String uri) throws ParseException { - // Workaround invalid percent encoding - // https://en.wikipedia.org/wiki/Percent-encoding - int i = 0; - int pos = uri.indexOf('%', i); - while (pos >= 0 && i + 3 < uri.length()) { - try { - if (pos + 3 > uri.length()) - break; - String hex = uri.substring(pos + 1, pos + 3); - int kar = Integer.parseInt(hex, 16); - if (kar > 127) - throw new NumberFormatException("Non ASCII: %" + hex); - } catch (NumberFormatException ex) { - uri = uri.substring(0, pos + 1) + "25" + uri.substring(pos + 1); - } catch (Throwable ex) { - Log.e(ex); - break; - } - i = pos + 3; - pos = uri.indexOf('%', i); - } - - return new MailTo(androidx.core.net.MailTo.parse(uri)); - } - - @NonNull - public static MailTo parse(@NonNull Uri uri) throws ParseException { - return parse(uri.toString()); - } - - String getTo() { - return instance.getTo(); - } - - String getCc() { - return instance.getCc(); - } - - String getSubject() { - return instance.getSubject(); - } - - Map getHeaders() { - return instance.getHeaders(); - } - - String getBody() { - return instance.getBody(); - } -} diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index ea7ec5b806..74f7bddc36 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -30,6 +30,7 @@ import android.text.TextUtils; import android.util.Base64; import androidx.annotation.NonNull; +import androidx.core.net.MailTo; import androidx.core.util.PatternsCompat; import androidx.documentfile.provider.DocumentFile; import androidx.preference.PreferenceManager;