From cbc7e1b6befcd728bb6bfc07646c2d07ac5a7d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Mon, 15 Jul 2019 18:53:59 +0200
Subject: [PATCH] android: fix crash if UserInfo is not set

Fixes: https://github.com/jitsi/jitsi-meet-sdk-samples/issues/11
---
 .../java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
index 7da78e9dc..e1c82fa1b 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
@@ -341,7 +341,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
         dest.writeString(token);
         dest.writeBundle(colorScheme);
         dest.writeBundle(featureFlags);
-        dest.writeBundle(userInfo.asBundle());
+        dest.writeBundle(userInfo != null ? userInfo.asBundle() : new Bundle());
         dest.writeByte((byte) (audioMuted == null ? 0 : audioMuted ? 1 : 2));
         dest.writeByte((byte) (audioOnly == null ? 0 : audioOnly ? 1 : 2));
         dest.writeByte((byte) (videoMuted == null ? 0 : videoMuted ? 1 : 2));