summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorPeter Rustler <peter.rustler@basyskom.com>2015-01-09 16:14:17 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-01-21 12:13:25 +0100
commitf93c04e44a5bd08fea76a1147b1aa51953bce925 (patch)
tree210e9f2e0162da6471ccec98c0529943e98984f8 /src/android
parentc87566bf9eb8e699aa1400876c1e314ff62f59fe (diff)
Added new private API for Android and onNewIntent
On Android the foreground activity can get intents with onNewIntent. Those intents can not be received in any other way. This is especially true in Android nfc. This patch adds a way to receive those intents in Qt. This patch heavily leans on the implementation of onActivityResult. Change-Id: Ic4dca301f34afe9a528149c3653e545ed3265a3c Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java5
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/QtNative.java1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 8e93b5b1f2..b6ba3e07ea 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -883,6 +883,11 @@ public class QtActivityDelegate
}
}
+ public void onNewIntent(Intent data)
+ {
+ QtNative.onNewIntent(data);
+ }
+
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
try {
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index 0e0072d234..0c7cd49100 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -628,6 +628,7 @@ public class QtNative
// activity methods
public static native void onActivityResult(int requestCode, int resultCode, Intent data);
+ public static native void onNewIntent(Intent data);
public static native void onAndroidUiThread(long id);
}