From b09168740b6be8c545340be09bd2ec64da2cb50e Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 17 Nov 2023 14:43:07 +0200 Subject: Android: don't return an unused result from QtNative.startApplication() No one is using that return code, instead print an error when the call to startQtAndroidPlugin() fails. Task-number: QTBUG-118077 Change-Id: I98c8e4ca9af5f1c45af36044336d461bed6acdc9 Reviewed-by: Ville Voutilainen --- src/android/jar/src/org/qtproject/qt/android/QtNative.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/QtNative.java index 88eefc45d2..7d48a4ea0f 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtNative.java @@ -254,18 +254,18 @@ public class QtNative runAction(() -> view.setVisibility(visible ? View.VISIBLE : View.GONE)); } - public static boolean startApplication(ArrayList params, String mainLib) + public static void startApplication(ArrayList params, String mainLib) { - final boolean[] res = new boolean[1]; synchronized (m_mainActivityMutex) { - String paramsStr = String.join("\t", params); - final String qtParams = mainLib + "\t" + paramsStr; - m_qtThread.run(() -> res[0] = startQtAndroidPlugin(qtParams)); + m_qtThread.run(() -> { + final String qtParams = mainLib + "\t" + String.join("\t", params); + if (!startQtAndroidPlugin(qtParams)) + Log.e(QtTAG, "An error occurred while starting the Qt Android plugin"); + }); m_qtThread.post(QtNative::startQtApplication); waitForServiceSetup(); m_started = true; } - return res[0]; } public static void quitApp() -- cgit v1.2.3