From 1615aeff878dd1f36f2fa62ac4e22549a190772a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 20 Apr 2018 11:32:50 +0200 Subject: [PATCH] fixed npe when OS invokes StartConversationsActivity with null action --- .../siacs/conversations/ui/StartConversationActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 36ae77c1d..ab0a1112d 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -745,7 +745,11 @@ public class StartConversationActivity extends XmppActivity implements XmppConne return invite.invite(); } } - switch (intent.getAction()) { + final String action = intent.getAction(); + if (action == null) { + return false; + } + switch (action) { case Intent.ACTION_SENDTO: case Intent.ACTION_VIEW: Uri uri = intent.getData();