From 58b464cf268e156fa4295a8a5c58dddc0a467394 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 31 Aug 2019 14:54:53 +0200
Subject: catch fcm library bugs

---
 .../java/de/pixart/messenger/services/PushManagementService.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/standardPush/java/de/pixart/messenger/services/PushManagementService.java')

diff --git a/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java b/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java
index 13251ce6a..5660b5f84 100644
--- a/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java
+++ b/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java
@@ -150,7 +150,13 @@ public class PushManagementService {
             if (!task.isSuccessful()) {
                 Log.d(Config.LOGTAG, "unable to get Firebase instance token", task.getException());
             }
-            final InstanceIdResult result = task.getResult();
+            final InstanceIdResult result;
+            try {
+                result = task.getResult();
+            } catch (Exception e) {
+                Log.d(Config.LOGTAG, "unable to get Firebase instance token due to bug in library ", e);
+                return;
+            }
             if (result != null) {
                 instanceTokenRetrieved.onGcmInstanceTokenRetrieved(result.getToken());
             }
-- 
cgit v1.2.3