AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Add information about who launched this activity to intents

Browse Source 
* 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 <assam.boudjelthia@qt.io>
This commit is contained in:
Lars Schmertmann 2020-06-13 12:27:33 +02:00 committed by Lars Schmertmann
parent 4bf3010378
commit 0755eba5e8
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
View File

@ -45,6 +45,7 @@ import android.content.res.Configuration;
import android.content.res.Resources.Theme; import android.content.res.Resources.Theme;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.AttributeSet; import android.util.AttributeSet;
@ -64,6 +65,8 @@ import org.qtproject.qt.android.QtNative;
public class QtActivity extends Activity 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, public String APPLICATION_PARAMETERS = null; // use this variable to pass any parameters to your application,
// the parameters must not contain any white spaces // the parameters must not contain any white spaces
// and must be separated with "\t" // and must be separated with "\t"
@ -260,11 +263,25 @@ public class QtActivity extends Activity
m_loader.onCreate(savedInstanceState); 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 @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
onCreateHook(savedInstanceState); onCreateHook(savedInstanceState);
addReferrer(getIntent());
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -479,6 +496,7 @@ public class QtActivity extends Activity
@Override @Override
protected void onNewIntent(Intent intent) protected void onNewIntent(Intent intent)
{ {
addReferrer(intent);
if (!QtApplication.invokeDelegate(intent).invoked) if (!QtApplication.invokeDelegate(intent).invoked)
super.onNewIntent(intent); super.onNewIntent(intent);
} }