summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAssam Boudjelthia <[email protected]>2023-09-16 16:03:33 +0300
committerAssam Boudjelthia <[email protected]>2023-10-18 16:54:32 +0300
commit17ef5be087ac6ee32ad2d45623feab5bfe06a304 (patch)
tree60b8578a3eeeab5b329ecbfe064a63df57a2d962 /src
parentac8c27bb1d767c12941f1b34ad7e4226a18de720 (diff)
Android: remove code path that's never reached in QtLoader
This check for error code is never reached, the error code is always set to 0 in startApp() and then check for in loadApplication() while the latter method is only called by startApp(). Task-number: QTBUG-114593 Task-number: QTBUG-115016 Change-Id: I762009d76567cc1d090fe29048c35220d433dd1d Reviewed-by: Tinja Paavoseppä <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtConstants.java2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtLoader.java18
2 files changed, 0 insertions, 20 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtConstants.java b/src/android/jar/src/org/qtproject/qt/android/QtConstants.java
index 252360fc9ab..a1026f515a5 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtConstants.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtConstants.java
@@ -4,8 +4,6 @@
package org.qtproject.qt.android;
public class QtConstants {
- public static final String ERROR_CODE_KEY = "error.code";
- public static final String ERROR_MESSAGE_KEY = "error.message";
public static final String DEX_PATH_KEY = "dex.path";
public static final String LIB_PATH_KEY = "lib.path";
public static final String LOADER_CLASS_NAME_KEY = "loader.class.name";
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
index 74cc2e29c81..e7f260fd513 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
@@ -109,23 +109,6 @@ public abstract class QtLoader {
final Resources resources = m_context.getResources();
final String packageName = m_context.getPackageName();
try {
- final int errorCode = loaderParams.getInt(ERROR_CODE_KEY);
- if (errorCode != 0) {
- // fatal error, show the error and quit
- AlertDialog errorDialog = new AlertDialog.Builder(m_context).create();
- errorDialog.setMessage(loaderParams.getString(ERROR_MESSAGE_KEY));
- errorDialog.setButton(Dialog.BUTTON_POSITIVE,
- resources.getString(android.R.string.ok),
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- });
- errorDialog.show();
- return;
- }
-
// add all bundled Qt libs to loader params
int id = resources.getIdentifier("bundled_libs", "array", packageName);
final String[] bundledLibs = resources.getStringArray(id);
@@ -267,7 +250,6 @@ public abstract class QtLoader {
}
Bundle loaderParams = new Bundle();
- loaderParams.putInt(ERROR_CODE_KEY, 0);
loaderParams.putString(DEX_PATH_KEY, new String());
id = resources.getIdentifier("static_init_classes", "string", packageName);