summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-13 12:27:33 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-26 19:34:22 +0000
commit46008e15e289f885088d638d2e746344d56f7c7e (patch)
tree957247d5782ab5792f024db5398aa4949f813f32 /src/android
parent0cee468d26d7c1cfcd461a00dd802715e64917ea (diff)
Android: Add information about who launched this activity to intents
* With this change, applications can easily determine the source of an intent without creating an own extension of QtActivity. * https://developer.android.com/reference/android/app/Activity#getReferrer() Task-number: QTBUG-84382 Change-Id: I6a5200af1d997640f02e2b934343914fb5f32ccc Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 0755eba5e8129ea536370c927ad9b0d034950a69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 17fcf0e19b..3d233f1c90 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -45,6 +45,7 @@ import android.content.res.Configuration;
import android.content.res.Resources.Theme;
import android.graphics.Bitmap;
import android.graphics.Canvas;
+import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.util.AttributeSet;
@@ -64,6 +65,8 @@ import org.qtproject.qt.android.QtNative;
public class QtActivity extends Activity
{
+ public static final String EXTRA_SOURCE_INFO = "org.qtproject.qt.android.sourceInfo";
+
public String APPLICATION_PARAMETERS = null; // use this variable to pass any parameters to your application,
// the parameters must not contain any white spaces
// and must be separated with "\t"
@@ -260,11 +263,25 @@ public class QtActivity extends Activity
m_loader.onCreate(savedInstanceState);
}
+ private void addReferrer(Intent intent)
+ {
+ if (intent.getExtras() != null && intent.getExtras().getString(EXTRA_SOURCE_INFO) != null)
+ return;
+
+ String sourceInformation = "";
+ Uri referrer = getReferrer();
+ if (referrer != null)
+ sourceInformation = referrer.toString().replaceFirst("android-app://", "");
+
+ intent.putExtra(EXTRA_SOURCE_INFO, sourceInformation);
+ }
+
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
onCreateHook(savedInstanceState);
+ addReferrer(getIntent());
}
//---------------------------------------------------------------------------
@@ -479,6 +496,7 @@ public class QtActivity extends Activity
@Override
protected void onNewIntent(Intent intent)
{
+ addReferrer(intent);
if (!QtApplication.invokeDelegate(intent).invoked)
super.onNewIntent(intent);
}