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

Merge branch 'master' into development

Browse source
This commit is contained in:
Daniel Gultsch 2015-08-19 12:29:23 +02:00
parent 9edcca1045 6e1870b00a
commit dafcee6a5b
2 changed files with 7 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

@ -385,6 +385,9 @@ public class FileBackend {
BitmapFactory.Options options = new BitmapFactory.Options(); BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = calcSampleSize(image, size); options.inSampleSize = calcSampleSize(image, size);
is = mXmppConnectionService.getContentResolver().openInputStream(image); is = mXmppConnectionService.getContentResolver().openInputStream(image);
if (is == null) {
return null;
}
Bitmap input = BitmapFactory.decodeStream(is, null, options); Bitmap input = BitmapFactory.decodeStream(is, null, options);
if (input == null) { if (input == null) {
return null; return null;
@ -411,6 +414,9 @@ public class FileBackend {
BitmapFactory.Options options = new BitmapFactory.Options(); BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = calcSampleSize(image,Math.max(newHeight, newWidth)); options.inSampleSize = calcSampleSize(image,Math.max(newHeight, newWidth));
is = mXmppConnectionService.getContentResolver().openInputStream(image); is = mXmppConnectionService.getContentResolver().openInputStream(image);
if (is == null) {
return null;
}
Bitmap source = BitmapFactory.decodeStream(is, null, options); Bitmap source = BitmapFactory.decodeStream(is, null, options);
if (source == null) { if (source == null) {
return null; return null;

2
src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
View file

@ -97,7 +97,7 @@ public class PhoneHelper {
if (packageName != null) { if (packageName != null) {
try { try {
return context.getPackageManager().getPackageInfo(packageName, 0).versionName; return context.getPackageManager().getPackageInfo(packageName, 0).versionName;
} catch (final PackageManager.NameNotFoundException e) { } catch (final PackageManager.NameNotFoundException | RuntimeException e) {
return "unknown"; return "unknown";
} }
} else { } else {