Fix processing of unsupported messages.

signalapp · Aug 4, 2020 · 3664e6f · 3664e6f
1 parent dda8808
commit 3664e6f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
@@ -236,10 +236,13 @@ private static PushProcessMessageJob.ExceptionMetadata toExceptionMetadata(@NonN
     if (sender == null) throw new NoSenderException();
 
     GroupId groupId = null;
-    try {
-      groupId = GroupUtil.idFromGroupContext(e.getGroup().orNull());
-    } catch (BadGroupIdException ex) {
-      Log.w(TAG, "Bad group id found in unsupported data message", ex);
+
+    if (e.getGroup().isPresent()) {
+      try {
+        groupId = GroupUtil.idFromGroupContext(e.getGroup().get());
+      } catch (BadGroupIdException ex) {
+        Log.w(TAG, "Bad group id found in unsupported data message", ex);
+      }
     }
 
     return new PushProcessMessageJob.ExceptionMetadata(sender,