summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2023-11-17 14:43:07 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2023-11-24 03:48:39 +0200
commitb09168740b6be8c545340be09bd2ec64da2cb50e (patch)
tree2d4c6cca441682a5b16d3217959a470834d91834
parent9826e4e38b8cfa12d292fb68903af2cc904f6d67 (diff)
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 <ville.voutilainen@qt.io>
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtNative.java12
1 files 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<String> params, String mainLib)
+ public static void startApplication(ArrayList<String> 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()