From 9fd0e7fea480a4f593698017f62ad673c9062157 Mon Sep 17 00:00:00 2001 From: sk Date: Mon, 28 Aug 2023 23:33:28 +0200 Subject: [PATCH] return if fcm device token is empty closes sk22#779 --- .../joinmastodon/android/api/PushSubscriptionManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 4633eec64..c1253ac3c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java @@ -125,11 +125,11 @@ public class PushSubscriptionManager{ // this function is used for registering push notifications using FCM // to avoid NonFreeNet in F-Droid, this registration is disabled in it // see https://github.com/LucasGGamerM/moshidon/issues/206 for more context - if(BuildConfig.BUILD_TYPE.equals("fdroidRelease")) + if(BuildConfig.BUILD_TYPE.equals("fdroidRelease") || TextUtils.isEmpty(deviceToken)){ + Log.d(TAG, "Skipping registering for FCM push notifications"); return; + } - if(TextUtils.isEmpty(deviceToken)) - throw new IllegalStateException("No device push token available"); String endpoint = "https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID; registerAccountForPush(subscription, endpoint); }