chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java - Issue 2094113002: Pass ShortcutHelper.EXTRA_SOURCE when WebAPK is launched from notification

Unified Diff: chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

Issue 2094113002: Pass ShortcutHelper.EXTRA_SOURCE when WebAPK is launched from notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'webapk_more_meta' into webapk_more_meta2 Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

index 658c3634d528c3f9b97d5e6b248d71a825dd04fa..b9d482adbc4a22219e85a10a3586c27c4195b3da 100644

--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

@@ -32,6 +32,7 @@ public class MainActivity extends Activity {

private static final String EXTRA_SHORT_NAME = "org.chromium.chrome.browser.webapp_short_name";

private static final String EXTRA_NAME = "org.chromium.chrome.browser.webapp_name";

private static final String EXTRA_URL = "org.chromium.chrome.browser.webapp_url";

+ private static final String EXTRA_SOURCE = "org.chromium.chrome.browser.webapp_source";

private static final String EXTRA_THEME_COLOR = "org.chromium.chrome.browser.theme_color";

private static final String EXTRA_BACKGROUND_COLOR =

"org.chromium.chrome.browser.background_color";

@@ -62,11 +63,13 @@ public class MainActivity extends Activity {

Bundle bundle = appInfo.metaData;

String url = bundle.getString(META_DATA_START_URL);

- String overrideUrl = getIntent().getDataString();

+ Intent intent = getIntent();

+ String overrideUrl = intent.getDataString();

// TODO(pkotwicz): Use same logic as {@code IntentHandler#shouldIgnoreIntent()}

if (overrideUrl != null && overrideUrl.startsWith("https:")) {

url = overrideUrl;

}

+ int source = intent.getIntExtra(EXTRA_SOURCE, 0);

Peter Beverloo 2016/06/28 23:09:24 nit: any way we could use ShortcutSource.UNKNOWN h

pkotwicz 2016/06/30 20:49:26 Unfortunately not. MainActivity cannot depend on a

String webappId = WebApkConstants.WEBAPK_ID_PREFIX + packageName;

String runtimeHost = bundle.getString(META_DATA_RUNTIME_HOST);

@@ -94,6 +97,7 @@ public class MainActivity extends Activity {

.putExtra(EXTRA_NAME, name)

.putExtra(EXTRA_URL, url)

.putExtra(EXTRA_ICON, encodedIcon)

+ .putExtra(EXTRA_SOURCE, source)

.putExtra(EXTRA_THEME_COLOR, themeColor)

.putExtra(EXTRA_BACKGROUND_COLOR, backgroundColor)

.putExtra(EXTRA_IS_ICON_GENERATED, isIconGenerated)

« no previous file with comments | « chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkNavigationClient.java ('k') | no next file » | no next file with comments »