godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix issue causing the response callback to be invoked with the invalid requestCode.

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2021-04-09 13:38:36 -07:00
parent 5fe89e8ccd
commit dedeada310
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java
View File

@@ -64,30 +64,27 @@ public abstract class FullScreenGodotApp extends FragmentActivity implements God
@Override @Override
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (godotFragment != null) { if (godotFragment != null) {
godotFragment.onNewIntent(intent); godotFragment.onNewIntent(intent);
} else {
super.onNewIntent(intent);
} }
} }
@CallSuper @CallSuper
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (godotFragment != null) { if (godotFragment != null) {
godotFragment.onActivityResult(requestCode, resultCode, data); godotFragment.onActivityResult(requestCode, resultCode, data);
} else {
super.onActivityResult(requestCode, resultCode, data);
} }
} }
@CallSuper @CallSuper
@Override @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (godotFragment != null) { if (godotFragment != null) {
godotFragment.onRequestPermissionsResult(requestCode, permissions, grantResults); godotFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
} else {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
} }
} }