aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-29 15:53:48 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-29 15:53:48 +0200
commitfdc2dcd62effce445a148ed6ebfa8192cfb4fd13 (patch)
tree94f0bd910ff9c37dd1c15e139570af6bfb80f409 /src/main/java/de
parentd4af9d6b87cfbddf1ae920e98766c924a4625495 (diff)
fixed npe when OS invokes StartConversationsActivity with null action
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index ae2dcf0bf..d3fedbef4 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -755,7 +755,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();