From ad90e932c6a879ae106bb0c8d53e271e60657508 Mon Sep 17 00:00:00 2001 From: UniquePassive Date: Tue, 30 Jan 2018 18:45:57 +0100 Subject: [PATCH] screenshot plugin: fix okhttp resource leak on imgur upload --- .../plugins/screenshot/ScreenshotPlugin.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 7df0ba15ab..14e8439fbe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -422,21 +422,23 @@ public class ScreenshotPlugin extends Plugin @Override public void onResponse(Call call, Response response) throws IOException { - InputStream in = response.body().byteStream(); - ImageUploadResponse imageUploadResponse = RuneLiteAPI.GSON - .fromJson(new InputStreamReader(in), ImageUploadResponse.class); - - if (imageUploadResponse.isSuccess()) + try (InputStream in = response.body().byteStream()) { - String link = imageUploadResponse.getData().getLink(); + ImageUploadResponse imageUploadResponse = RuneLiteAPI.GSON + .fromJson(new InputStreamReader(in), ImageUploadResponse.class); - StringSelection selection = new StringSelection(link); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(selection, selection); - - if (config.notifyWhenTaken()) + if (imageUploadResponse.isSuccess()) { - notifier.notify("A screenshot was uploaded and inserted into your clipboard!", TrayIcon.MessageType.INFO); + String link = imageUploadResponse.getData().getLink(); + + StringSelection selection = new StringSelection(link); + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + clipboard.setContents(selection, selection); + + if (config.notifyWhenTaken()) + { + notifier.notify("A screenshot was uploaded and inserted into your clipboard!", TrayIcon.MessageType.INFO); + } } } }