From d85854b686a886d06b4c92b6aaf80e9a3a6d9a2f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 15 Jan 2016 23:47:16 +0100 Subject: [PATCH] show toast when image cropper get oom --- .../conversations/ui/PublishProfilePictureActivity.java | 7 +++++++ src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index 0743b9305..e203b86db 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -186,6 +186,13 @@ public class PublishProfilePictureActivity extends XmppActivity { loadImageIntoPreview(this.avatarUri); break; } + } else { + if (requestCode == Crop.REQUEST_CROP) { + Throwable throwable = Crop.getError(data); + if (throwable != null && throwable instanceof OutOfMemoryError) { + Toast.makeText(this,R.string.selection_too_large, Toast.LENGTH_SHORT).show(); + } + } } } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4949fba3c..69e0eff78 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -579,4 +579,5 @@ Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those. Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. Disable + The selected area is too large