moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 03:32:15 -05:00
Code Issues Releases Wiki Activity

add intent!=null check in onActivityResultin PublishProfilePicture

Browse Source
This commit is contained in:
Daniel Gultsch 2016-01-20 16:11:17 +01:00
parent ba143a2730
commit 0619685e55
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
View File

@ -187,7 +187,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
break; break;
} }
} else { } else {
if (requestCode == Crop.REQUEST_CROP) { if (requestCode == Crop.REQUEST_CROP && data != null) {
Throwable throwable = Crop.getError(data); Throwable throwable = Crop.getError(data);
if (throwable != null && throwable instanceof OutOfMemoryError) { if (throwable != null && throwable instanceof OutOfMemoryError) {
Toast.makeText(this,R.string.selection_too_large, Toast.LENGTH_SHORT).show(); Toast.makeText(this,R.string.selection_too_large, Toast.LENGTH_SHORT).show();