From 12b27cc56b5a1cd63f3be2e9a908217112193a55 Mon Sep 17 00:00:00 2001
From: Christian Ascheberg <c.ascheberg@gmx.de>
Date: Sun, 12 Mar 2017 09:13:09 +0100
Subject: [PATCH] Fix WebRTC capability check for unregistered users

Fixes #6358
Closes #6368
// FREEBIE
---
 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 85e184385d..d0ae41ca5f 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -974,7 +974,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeBetaCalling() {
-    if (!TextSecurePreferences.isWebrtcCallingEnabled(this) || isGroupConversation()) {
+    if (!TextSecurePreferences.isPushRegistered(this)       ||
+        !TextSecurePreferences.isWebrtcCallingEnabled(this) ||
+        isGroupConversation())
+    {
       return;
     }