From 065db923cc2ea6efc21a03ba14dcb9721ba9abe1 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <moshidon.app@gmail.com>
Date: Tue, 11 Mar 2025 14:52:07 -0300
Subject: [PATCH] fix(unifiedPushHelper): surround by try and catch due to a
 javax.crypto.AEADBadTagException

cc: @p1gp1g
---
 .../android/utils/UnifiedPushHelper.java      | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/UnifiedPushHelper.java b/mastodon/src/main/java/org/joinmastodon/android/utils/UnifiedPushHelper.java
index af78d845e..99caefb87 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/utils/UnifiedPushHelper.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/utils/UnifiedPushHelper.java
@@ -29,21 +29,29 @@ public class UnifiedPushHelper {
 
 	public static void registerAllAccounts(@NonNull Context context) {
 		for (AccountSession accountSession : AccountSessionManager.getInstance().getLoggedInAccounts()){
-			UnifiedPush.register(
-					context,
-					accountSession.getID(),
-					null,
-					accountSession.app.vapidKey.replaceAll("=","")
-			);
+			try {
+				UnifiedPush.register(
+						context,
+						accountSession.getID(),
+						null,
+						accountSession.app.vapidKey.replaceAll("=","")
+				);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
 	}
 
 	public static void unregisterAllAccounts(@NonNull Context context) {
 		for (AccountSession accountSession : AccountSessionManager.getInstance().getLoggedInAccounts()){
-			UnifiedPush.unregister(
+			try {
+				UnifiedPush.unregister(
 					context,
 					accountSession.getID()
-			);
+				);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 			// use FCM again
 			accountSession.getPushSubscriptionManager().registerAccountForPush(null);
 		}