godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47760 from m4gr3d/update_activity_result_behavior_master 

Fix issue causing the response callback to be invoked with the invalid `requestCode`
This commit is contained in:
Rémi Verschelde 2021-04-09 23:02:51 +02:00 committed by GitHub
parent 2295d3eba6 a21457155b
commit 81fc9fa1dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.KeyEvent; import android.view.KeyEvent;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@ -63,30 +62,9 @@ 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
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (godotFragment != null) {
godotFragment.onActivityResult(requestCode, resultCode, data);
} else {
super.onActivityResult(requestCode, resultCode, data);
}
}
@CallSuper
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (godotFragment != null) {
godotFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
} else {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
} }
} }