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

Fix onMainRequestPermissionsResult callback for Android plugins.

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2021-03-17 09:23:58 -07:00
parent 5d8ae492ba
commit 14e7f6fa7c
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ 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;
@@ -70,6 +71,26 @@ public abstract class FullScreenGodotApp extends FragmentActivity implements God
} }
} }
@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);
}
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (godotFragment != null) { if (godotFragment != null) {

4
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View File

@@ -287,8 +287,10 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
godotHost = null; godotHost = null;
} }
@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 (result_callback != null) { if (result_callback != null) {
result_callback.callback(requestCode, resultCode, data); result_callback.callback(requestCode, resultCode, data);
result_callback = null; result_callback = null;
@@ -303,8 +305,10 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
} }
} }
@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);
for (int i = 0; i < singleton_count; i++) { for (int i = 0; i < singleton_count; i++) {
singletons[i].onMainRequestPermissionsResult(requestCode, permissions, grantResults); singletons[i].onMainRequestPermissionsResult(requestCode, permissions, grantResults);
} }