From 1c504bdfe6d5bd588bdb57b021f3ae02c98c1bf3 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 27 Dec 2018 14:20:38 +0100
Subject: [PATCH] Fix #392

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
index e7659c3cd..82d0f4791 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -246,9 +246,11 @@ public class MagicPeerConnectionWrapper {
                                     .NICK_CHANGE, sessionId, getNick(), null));
                         }
                     } else {
-                        HashMap<String, String> payloadHashMap = (HashMap<String, String>) dataChannelMessage.getPayload();
-                        EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                                .NICK_CHANGE, payloadHashMap.get("userid"), payloadHashMap.get("name"), null));
+                        if (dataChannelMessage.getPayload() != null) {
+                            HashMap<String, String> payloadHashMap = (HashMap<String, String>) dataChannelMessage.getPayload();
+                            EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
+                                    .NICK_CHANGE, payloadHashMap.get("userid"), payloadHashMap.get("name"), null));
+                        }
                     }
 
                 } else if ("audioOn".equals(dataChannelMessage.getType())) {