Merge pull request LucasGGamerM#491 from mishnz/master

Second fix for MIME64 inconsistency in serverKey.
FineFindus · Jan 2, 2023 · 60517b0 · 60517b0
2 parents 525cc69 + faf5e8e
commit 60517b0
Showing 1 changed file with 3 additions and 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
@@ -162,7 +162,9 @@ public void registerAccountForPush(PushSubscription subscription){
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.DEFAULT));
+								result.serverKey=result.serverKey.replace('/','_');
+								result.serverKey=result.serverKey.replace('+','-');
+								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)