From 7ed1b164b5cc29f2887ca2a29536e8f256be0ec5 Mon Sep 17 00:00:00 2001 From: mishnz Date: Sun, 1 Jan 2023 18:50:09 +1300 Subject: [PATCH] The Mastodon server does not currently use URL_SAFE encoding on its serverKey. Using URL_SAFE in this client means the client will crash for any server that uses a key that generates a Mime64 string containing a "+" or "/". This change removes the URL_SAFE logic. See: https://github.com/mastodon/mastodon-android/issues/483 --- .../org/joinmastodon/android/api/PushSubscriptionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java index e646605d4..01822fb8a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java @@ -162,7 +162,7 @@ public class PushSubscriptionManager{ @Override public void onSuccess(PushSubscription result){ MastodonAPIController.runInBackground(()->{ - serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE)); + serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.DEFAULT)); AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID); if(session==null)