Fix for NPE

signalapp · Feb 20, 2014 · 1d4d966 · 1d4d966 · WhisperBTC · Feb 20, 2014
1 parent a0cbbd2
commit 1d4d966
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
@@ -61,7 +61,7 @@ public IncomingTextMessage(IncomingPushMessage message, String encodedBody, Grou
     this.pseudoSubject        = "";
     this.sentTimestampMillis  = message.getTimestampMillis();
 
-    if (group.hasId()) {
+    if (group != null && group.hasId()) {
       this.groupId = GroupUtil.getEncodedId(group.getId().toByteArray());
     } else {
       this.groupId = null;