add intent!=null check in onActivityResultin PublishProfilePicture

Daniel Gultsch created 10 years ago

Change summary

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

Detailed changes

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();