From 9ce2843c281c3eadaee45a6dcee50bb5b6fdd429 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 9 Mar 2017 20:42:23 +0100
Subject: do not show 'block stranger' snackbar in empty conversations

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 18c3cb5cf..8f42e8d32 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1089,7 +1089,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                 && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
                 && (!conversation.isOtrFingerprintVerified())) {
             showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify);
-        } else if (conversation.isWithStranger() && !conversation.isBlocked()) {
+        } else if (conversation.countMessages() != 0
+                && !conversation.isBlocked()
+                && conversation.isWithStranger()) {
             showSnackbar(R.string.received_message_from_stranger, R.string.block, mBlockClickListener);
         } else {
             hideSnackbar();
-- 
cgit v1.2.3