narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

try to catch out of memory exception

Browse source
This commit is contained in:
Daniel Gultsch 2018-08-18 18:13:51 +02:00
parent 25aa6bed1e
commit 8f057a0c95
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -784,11 +784,12 @@ public class FileBackend {
bitmap = BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(uri)); bitmap = BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(uri));
return getPepAvatar(bitmap, Bitmap.CompressFormat.PNG, 100); return getPepAvatar(bitmap, Bitmap.CompressFormat.PNG, 100);
} catch (Exception e) { } catch (Exception e) {
return null;
} finally {
if (bitmap != null) { if (bitmap != null) {
bitmap.recycle(); bitmap.recycle();
} }
} }
return null;
} }
private Avatar getPepAvatar(Bitmap bitmap, Bitmap.CompressFormat format, int quality) { private Avatar getPepAvatar(Bitmap bitmap, Bitmap.CompressFormat format, int quality) {
@ -822,6 +823,9 @@ public class FileBackend {
avatar.width = bitmap.getWidth(); avatar.width = bitmap.getWidth();
avatar.height = bitmap.getHeight(); avatar.height = bitmap.getHeight();
return avatar; return avatar;
} catch (OutOfMemoryError e) {
Log.d(Config.LOGTAG,"unable to convert avatar to base64 due to low memory");
return null;
} catch (Exception e) { } catch (Exception e) {
return null; return null;
} }