Skip to content

Commit 7a9c14e

Browse files
authored
Merge pull request #47759 from m4gr3d/update_activity_result_behavior_3_3
[3.x] Fix issue causing the response callback to be invoked with the invalid `requestCode`
2 parents 5fe89e8 + dedeada commit 7a9c14e

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,27 @@ public void onCreate(Bundle savedInstanceState) {
6464

6565
@Override
6666
public void onNewIntent(Intent intent) {
67+
super.onNewIntent(intent);
6768
if (godotFragment != null) {
6869
godotFragment.onNewIntent(intent);
69-
} else {
70-
super.onNewIntent(intent);
7170
}
7271
}
7372

7473
@CallSuper
7574
@Override
7675
public void onActivityResult(int requestCode, int resultCode, Intent data) {
76+
super.onActivityResult(requestCode, resultCode, data);
7777
if (godotFragment != null) {
7878
godotFragment.onActivityResult(requestCode, resultCode, data);
79-
} else {
80-
super.onActivityResult(requestCode, resultCode, data);
8179
}
8280
}
8381

8482
@CallSuper
8583
@Override
8684
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
85+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
8786
if (godotFragment != null) {
8887
godotFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
89-
} else {
90-
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
9188
}
9289
}
9390

0 commit comments

Comments
 (0)