From 156c4da2b31d91a725644dbd2d82bb1a276a9a68 Mon Sep 17 00:00:00 2001 From: maxim432 Date: Sat, 30 Jan 2021 17:56:54 -0800 Subject: [PATCH] Fix couple of leaks --- .../java/eu/siacs/conversations/persistance/FileBackend.java | 4 +++- .../siacs/conversations/services/XmppConnectionService.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 10421a27d..a49f2e497 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -1295,7 +1295,9 @@ public class FileBackend { private int calcSampleSize(Uri image, int size) throws FileNotFoundException, SecurityException { BitmapFactory.Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; - BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(image), null, options); + InputStream inputStream = mXmppConnectionService.getContentResolver().openInputStream(image); + BitmapFactory.decodeStream(inputStream, null, options); + close(inputStream); return calcSampleSize(options, size); } diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 05ec26d67..3cf5aa9d1 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1241,6 +1241,7 @@ public class XmppConnectionService extends Service { public void onDestroy() { try { unregisterReceiver(this.mInternalEventReceiver); + unregisterReceiver(this.mInternalScreenEventReceiver); } catch (final IllegalArgumentException e) { //ignored }