summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-06-21 12:01:47 +0200
committerGitHub <noreply@github.com>2016-06-21 12:01:47 +0200
commitb7b547a191ce89df25bfcc322e1305c15f149f49 (patch)
tree538aa7d986e4166b93ef79f512505dcae2c3ca0c
parentd76ee09774c546476b350c15a4197d2b9ae160dc (diff)
parent780fa60072eb1957eb1e4abdcf4fbd2a9e5bda95 (diff)
Merge pull request #5319 from volzhs/android-new-intent
correct current Intent for android
-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 73d54b6afa..cdf17e3161 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));
@@ -545,6 +555,8 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
}
}
+ mCurrentIntent = getIntent();
+
initializeGodot();