From 8ba5669ee460c9e5b37f1b52eefb1ffa74296fe2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:18:18 +0200
Subject: [PATCH] Small fix

---
 app/src/main/java/eu/faircode/email/UriHelper.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index dad8a37cef..5e5c49b32c 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -313,7 +313,7 @@ public class UriHelper {
                 uri.getQueryParameter("p") != null) {
             try {
                 // Mandrill
-                String p = new String(Base64.decode(uri.getQueryParameter("p"), Base64.DEFAULT));
+                String p = new String(Base64.decode(uri.getQueryParameter("p"), Base64.URL_SAFE));
                 JSONObject json = new JSONObject(p);
                 json = new JSONObject(json.getString("p"));
                 Uri result = Uri.parse(json.getString("url"));
@@ -330,7 +330,7 @@ public class UriHelper {
             String key = uri.getQueryParameterNames().iterator().next();
             if (TextUtils.isEmpty(uri.getQueryParameter(key)))
                 try {
-                    String data = new String(Base64.decode(key, Base64.DEFAULT));
+                    String data = new String(Base64.decode(key, Base64.URL_SAFE));
                     int v = data.indexOf("ver=");
                     int u = data.indexOf("&&url=");
                     if (v == 0 && u > 0)
@@ -344,7 +344,7 @@ public class UriHelper {
         } else if (uri.getQueryParameter("redirectUrl") != null) {
             // https://.../link-tracker?redirectUrl=<base64>&sig=...&iat=...&a=...&account=...&email=...&s=...&i=...
             try {
-                byte[] bytes = Base64.decode(uri.getQueryParameter("redirectUrl"), 0);
+                byte[] bytes = Base64.decode(uri.getQueryParameter("redirectUrl"), Base64.URL_SAFE);
                 String u = URLDecoder.decode(new String(bytes), StandardCharsets.UTF_8.name());
                 Uri result = Uri.parse(u);
                 changed = (result != null);