try to catch out of memory exception
This commit is contained in:
parent
25aa6bed1e
commit
8f057a0c95
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue