From 0619685e5502e7cd0f876d69fbc036df7790b29e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 20 Jan 2016 16:11:17 +0100
Subject: add intent!=null check in onActivityResultin PublishProfilePicture

---
 .../java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index e203b86d..97e23c08 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -187,7 +187,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 					break;
 			}
 		} else {
-			if (requestCode == Crop.REQUEST_CROP) {
+			if (requestCode == Crop.REQUEST_CROP  && data != null) {
 				Throwable throwable = Crop.getError(data);
 				if (throwable != null && throwable instanceof OutOfMemoryError) {
 					Toast.makeText(this,R.string.selection_too_large, Toast.LENGTH_SHORT).show();
-- 
cgit v1.2.3