Преглед на файлове

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`
Rémi Verschelde преди 4 години
родител
ревизия
7a9c14e276
променени са 1 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 3 6
      platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java

+ 3 - 6
platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java

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