From fbf512337113c78eec3075d5ded7f18e4cd99562 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 25 Oct 2024 18:48:58 +0300 Subject: [PATCH] Android: use try(resource) to auto-close in case of resource error Change-Id: I0a57df1b18ec9da8f673d295172cf9dd8c179c4c Reviewed-by: Petri Virkkunen --- .../jar/src/org/qtproject/qt/android/CursorHandle.java | 6 ++++-- .../org/qtproject/qt/android/QtMessageDialogHelper.java | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java index 519fe86968d..8bc4f569b70 100644 --- a/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java +++ b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java @@ -107,8 +107,10 @@ class CursorHandle implements ViewTreeObserver.OnPreDrawListener Context context = m_layout.getContext(); int[] attrs = {m_attr}; - TypedArray a = context.getTheme().obtainStyledAttributes(attrs); - Drawable drawable = a.getDrawable(0); + Drawable drawable; + try (TypedArray a = context.getTheme().obtainStyledAttributes(attrs)) { + drawable = a.getDrawable(0); + } m_cursorView = new CursorView(context, this); m_cursorView.setImageDrawable(drawable); diff --git a/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java index 943914a2418..5afeed46b00 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java @@ -123,9 +123,11 @@ class QtMessageDialogHelper private Drawable getStyledDrawable(int id) { int[] attrs = { id }; - final TypedArray a = m_theme.obtainStyledAttributes(attrs); - Drawable d = a.getDrawable(0); - a.recycle(); + Drawable d; + try (TypedArray a = m_theme.obtainStyledAttributes(attrs)) { + d = a.getDrawable(0); + a.recycle(); + } return d; }