diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-08-20 10:44:50 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-08-20 10:44:50 +0200 |
commit | 8927ba8065fd145fb6c8eeceaa6a807a7ee6d4f0 (patch) | |
tree | 07bc600e018fe9e9ab82b7b22c186c8f04bc4a6c /src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | |
parent | a0038565c582ee630e80ed61d346133c8ba1988e (diff) |
various null pointer checks
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 67c97dd1..cc7394b4 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -815,8 +815,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU switch (intent.getAction()) { case Intent.ACTION_SENDTO: case Intent.ACTION_VIEW: - Log.d(Config.LOGTAG, "received uri=" + intent.getData()); - return new Invite(intent.getData()).invite(); + Uri uri = intent.getData(); + if (uri != null) { + Log.d(Config.LOGTAG, "received uri=" + intent.getData()); + return new Invite(intent.getData()).invite(); + } else { + return false; + } case NfcAdapter.ACTION_NDEF_DISCOVERED: for (Parcelable message : getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES)) { if (message instanceof NdefMessage) { |