diff --git a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java --- a/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java +++ b/src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java @@ -198,8 +198,7 @@ sendMessage(np); if (serverSocket != null) { - BluetoothSocket transferSocket = serverSocket.accept(); - try { + try (BluetoothSocket transferSocket = serverSocket.accept()) { serverSocket.close(); int idealBufferLength = 4096; @@ -223,11 +222,6 @@ } catch (Exception e) { callback.onFailure(e); return false; - } finally { - try { - transferSocket.close(); - } catch (IOException ignored) { - } } } diff --git a/src/org/kde/kdeconnect/Helpers/ContactsHelper.java b/src/org/kde/kdeconnect/Helpers/ContactsHelper.java --- a/src/org/kde/kdeconnect/Helpers/ContactsHelper.java +++ b/src/org/kde/kdeconnect/Helpers/ContactsHelper.java @@ -91,12 +91,8 @@ } Uri photoUri = Uri.parse(photoId); - InputStream input = null; - Base64OutputStream output = null; - try { - ByteArrayOutputStream encodedPhoto = new ByteArrayOutputStream(); - output = new Base64OutputStream(encodedPhoto, Base64.DEFAULT); - input = context.getContentResolver().openInputStream(photoUri); + ByteArrayOutputStream encodedPhoto = new ByteArrayOutputStream(); + try (InputStream input = context.getContentResolver().openInputStream(photoUri); Base64OutputStream output = new Base64OutputStream(encodedPhoto, Base64.DEFAULT)) { byte[] buffer = new byte[1024]; int len; //noinspection ConstantConditions @@ -107,19 +103,6 @@ } catch (Exception ex) { Log.e("ContactsHelper", ex.toString()); return ""; - } finally { - try { - //noinspection ConstantConditions - input.close(); - } catch (Exception ignored) { - } - - try { - //noinspection ConstantConditions - output.close(); - } catch (Exception ignored) { - } - } }