From 0755eba5e8129ea536370c927ad9b0d034950a69 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 13 Jun 2020 12:27:33 +0200 Subject: 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 Pick-to: 6.2 Change-Id: I6a5200af1d997640f02e2b934343914fb5f32ccc Reviewed-by: Assam Boudjelthia --- .../org/qtproject/qt/android/bindings/QtActivity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java') 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); } -- cgit v1.2.3