diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-24 16:31:37 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-29 08:00:05 +0000 |
commit | 950e628fd842f22ac741b18440fcc99213820587 (patch) | |
tree | 7ca403adb6d8ce80e01071ced1479b6cb7a7d884 /src/android/jar | |
parent | 90912b657edf27d40aa1a8ac8fbc3bae8d285e25 (diff) |
Android: replace stacktrace with debug message in search for setActivity
Don't print stacktrace when setActivity is not found but only print a
debug message, QtActivityDelegate will continue to look for setContext
which might actually be a problem if not implemented.
Fixes: QTBUG-86733
Pick-to: 5.15.2
Change-Id: Iaf7f347ae04605a1f616f24d25cac4938c1640a4
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Diffstat (limited to 'src/android/jar')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java index e04da7376d..35d86611c6 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java @@ -95,6 +95,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; +import java.util.Objects; import org.qtproject.qt.android.accessibility.QtAccessibilityDelegate; @@ -592,7 +593,7 @@ public class QtActivityDelegate QtNative.setActivity(m_activity, this); QtNative.setClassLoader(classLoader); if (loaderParams.containsKey(STATIC_INIT_CLASSES_KEY)) { - for (String className: loaderParams.getStringArray(STATIC_INIT_CLASSES_KEY)) { + for (String className: Objects.requireNonNull(loaderParams.getStringArray(STATIC_INIT_CLASSES_KEY))) { if (className.length() == 0) continue; @@ -603,9 +604,10 @@ public class QtActivityDelegate Method m = initClass.getMethod("setActivity", Activity.class, Object.class); m.invoke(staticInitDataObject, m_activity, this); } catch (Exception e) { - e.printStackTrace(); + Log.d(QtNative.QtTAG, "Class " + className + " does not implement setActivity method"); } + // For modules that don't need/have setActivity try { Method m = initClass.getMethod("setContext", Context.class); m.invoke(staticInitDataObject, (Context)m_activity); |