atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Activity.startActivityForResult(): use internalCreateActivity helper method

Browse Source
This commit is contained in:
Julian Winkler
2025-01-11 17:44:35 +01:00
parent a4c14c9cd1
commit 6be60574aa
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api-impl/android/app/Activity.java
View File

@@ -321,11 +321,7 @@ public class Activity extends ContextThemeWrapper implements Window.Callback {
Slog.i(TAG, "startActivityForResult(" + intent + ", " + requestCode + "," + options + ") called"); Slog.i(TAG, "startActivityForResult(" + intent + ", " + requestCode + "," + options + ") called");
if (intent.getComponent() != null) { if (intent.getComponent() != null) {
try { try {
Class<? extends Activity> cls = Class.forName(intent.getComponent().getClassName()).asSubclass(Activity.class); final Activity activity = internalCreateActivity(intent.getComponent().getClassName(), getWindow().native_window, intent);
Constructor<? extends Activity> constructor = cls.getConstructor();
final Activity activity = constructor.newInstance();
activity.intent = intent;
activity.getWindow().native_window = getWindow().native_window;
activity.resultRequestCode = requestCode; activity.resultRequestCode = requestCode;
activity.resultActivity = this; activity.resultActivity = this;
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@@ -334,7 +330,7 @@ public class Activity extends ContextThemeWrapper implements Window.Callback {
nativeStartActivity(activity); nativeStartActivity(activity);
} }
}); });
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { } catch (ReflectiveOperationException e) {
onActivityResult(requestCode, 0 /*RESULT_CANCELED*/, new Intent()); onActivityResult(requestCode, 0 /*RESULT_CANCELED*/, new Intent());
} }
} else if (FILE_CHOOSER_ACTIONS.contains(intent.getAction())) { } else if (FILE_CHOOSER_ACTIONS.contains(intent.getAction())) {