From 6330be2152e56afad4ae9a59da9da0900500ba05 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 22 Jun 2016 22:22:50 +0200
Subject: fixed bug on opening notifications

---
 src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs')

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index c24946fbd..f403d7389 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1325,7 +1325,7 @@ public class ConversationActivity extends XmppActivity
 
         Bundle extras = getIntent().getExtras();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (extras != null) {
+            if (extras != null && extras.containsKey("FirstStart")) {
                 FirstStartTime = extras.getLong("FirstStart");
                 Log.d(Config.LOGTAG, "Get first start time from StartUI: " + FirstStartTime);
             }
-- 
cgit v1.2.3