From a350106f7d73182934babf019e24f61b6e7de8e6 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 27 Nov 2017 09:44:50 -0800
Subject: [PATCH] Don't check DB workaround if push group

Fixes #7225
---
 src/org/thoughtcrime/securesms/ConversationActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 298855f28c..9d7411ae97 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1055,7 +1055,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         Log.w(TAG, "Resolving registered state...");
         RegisteredState registeredState;
 
-        if (recipient.isResolving()) {
+        if (recipient.isPushGroupRecipient()) {
+          Log.w(TAG, "Push group recipient...");
+          registeredState = RegisteredState.REGISTERED;
+        } else if (recipient.isResolving()) {
           Log.w(TAG, "Talking to DB directly.");
           registeredState = DatabaseFactory.getRecipientDatabase(ConversationActivity.this).isRegistered(recipient.getAddress());
         } else {