sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maxim432-fix_leaks'

This commit is contained in:
Daniel Gultsch 2021-01-31 10:13:35 +01:00
parent ca496fd39f 358c70828f
commit f82ae0a9b8
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View File

@ -601,12 +601,12 @@ public class FileBackend {
} }
} }
public boolean useImageAsIs(Uri uri) { public boolean useImageAsIs(final Uri uri) {
String path = getOriginalPath(uri); final String path = getOriginalPath(uri);
if (path == null || isPathBlacklisted(path)) { if (path == null || isPathBlacklisted(path)) {
return false; return false;
} }
File file = new File(path); final File file = new File(path);
long size = file.length(); long size = file.length();
if (size == 0 || size >= mXmppConnectionService.getResources().getInteger(R.integer.auto_accept_filesize)) { if (size == 0 || size >= mXmppConnectionService.getResources().getInteger(R.integer.auto_accept_filesize)) {
return false; return false;
@ -614,12 +614,15 @@ public class FileBackend {
BitmapFactory.Options options = new BitmapFactory.Options(); BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
try { try {
BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(uri), null, options); final InputStream inputStream = mXmppConnectionService.getContentResolver().openInputStream(uri);
BitmapFactory.decodeStream(inputStream, null, options);
close(inputStream);
if (options.outMimeType == null || options.outHeight <= 0 || options.outWidth <= 0) { if (options.outMimeType == null || options.outHeight <= 0 || options.outWidth <= 0) {
return false; return false;
} }
return (options.outWidth <= Config.IMAGE_SIZE && options.outHeight <= Config.IMAGE_SIZE && options.outMimeType.contains(Config.IMAGE_FORMAT.name().toLowerCase())); return (options.outWidth <= Config.IMAGE_SIZE && options.outHeight <= Config.IMAGE_SIZE && options.outMimeType.contains(Config.IMAGE_FORMAT.name().toLowerCase()));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Log.d(Config.LOGTAG, "unable to get image dimensions", e);
return false; return false;
} }
} }
@ -796,14 +799,17 @@ public class FileBackend {
updateFileParams(message); updateFileParams(message);
} }
public boolean unusualBounds(Uri image) { public boolean unusualBounds(final Uri image) {
try { try {
BitmapFactory.Options options = new BitmapFactory.Options(); final BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(image), null, options); final InputStream inputStream = mXmppConnectionService.getContentResolver().openInputStream(image);
BitmapFactory.decodeStream(inputStream, null, options);
close(inputStream);
float ratio = (float) options.outHeight / options.outWidth; float ratio = (float) options.outHeight / options.outWidth;
return ratio > (21.0f / 9.0f) || ratio < (9.0f / 21.0f); return ratio > (21.0f / 9.0f) || ratio < (9.0f / 21.0f);
} catch (Exception e) { } catch (final Exception e) {
Log.w(Config.LOGTAG, "unable to detect image bounds", e);
return false; return false;
} }
} }
@ -1293,9 +1299,11 @@ public class FileBackend {
} }
private int calcSampleSize(Uri image, int size) throws FileNotFoundException, SecurityException { private int calcSampleSize(Uri image, int size) throws FileNotFoundException, SecurityException {
BitmapFactory.Options options = new BitmapFactory.Options(); final BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(image), null, options); final InputStream inputStream = mXmppConnectionService.getContentResolver().openInputStream(image);
BitmapFactory.decodeStream(inputStream, null, options);
close(inputStream);
return calcSampleSize(options, size); return calcSampleSize(options, size);
} }

1
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1241,6 +1241,7 @@ public class XmppConnectionService extends Service {
public void onDestroy() { public void onDestroy() {
try { try {
unregisterReceiver(this.mInternalEventReceiver); unregisterReceiver(this.mInternalEventReceiver);
unregisterReceiver(this.mInternalScreenEventReceiver);
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
//ignored //ignored
} }