aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-01-20 16:11:17 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-01-20 16:11:17 +0100
commit0619685e5502e7cd0f876d69fbc036df7790b29e (patch)
treee58285d89883c689e5b5b6dc0cb43ffd79fbe8cb /src/main/java/eu
parentba143a27309657ce6694b0acaf2fb34069b79313 (diff)
add intent!=null check in onActivityResultin PublishProfilePicture
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java2
1 files changed, 1 insertions, 1 deletions
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();