aboutsummaryrefslogtreecommitdiff
path: root/platform/android/java/src
diff options
context:
space:
mode:
authorvolzhs2016-06-21 03:32:44 +0900
committerRémi Verschelde2016-06-25 01:41:59 +0200
commit5582d37af946c2fa623f72023c2d48e4eec2ed5e (patch)
treeee3136fc78369cc298b0492cda05b0f194ac96f2 /platform/android/java/src
parent8c5577e9e4d560a308784162073cf6287bccefe7 (diff)
downloadgodot-5582d37af946c2fa623f72023c2d48e4eec2ed5e.tar.gz
godot-5582d37af946c2fa623f72023c2d48e4eec2ed5e.tar.zst
godot-5582d37af946c2fa623f72023c2d48e4eec2ed5e.zip
correct current Intent for android
(cherry picked from commit 780fa60072eb1957eb1e4abdcf4fbd2a9e5bda95)
Diffstat (limited to 'platform/android/java/src')
-rw-r--r--platform/android/java/src/org/godotengine/godot/Godot.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/platform/android/java/src/org/godotengine/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java
index 1f208f8fb..29bdb38f0 100644
--- a/platform/android/java/src/org/godotengine/godot/Godot.java
+++ b/platform/android/java/src/org/godotengine/godot/Godot.java
@@ -115,7 +115,17 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
private int mState;
private boolean keep_screen_on=true;
- private void setState(int newState) {
+ static private Intent mCurrentIntent;
+
+ @Override public void onNewIntent(Intent intent) {
+ mCurrentIntent = intent;
+ }
+
+ static public Intent getCurrentIntent() {
+ return mCurrentIntent;
+ }
+
+ private void setState(int newState) {
if (mState != newState) {
mState = newState;
mStatusText.setText(Helpers.getDownloaderStringResourceIDFromState(newState));
@@ -542,6 +552,8 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
}
}
+ mCurrentIntent = getIntent();
+
initializeGodot();