chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java - Issue 2758193002: [Android WebAPKs] Don't navigate WebAPK when launching it from launcher

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

Issue 2758193002: [Android WebAPKs] Don't navigate WebAPK when launching it from launcher (Closed)

Patch Set: Merge branch 'master' into twitter Created 3 years, 9 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

« chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java » ('j') | chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

index 64906a676c9cfc65600c40023b17160cce71b088..544ee3742267fdd6b8d1cf04c0916fbc79daa225 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

@@ -208,7 +208,10 @@ public class WebappLauncherActivity extends Activity {

if (TextUtils.isEmpty(webApkPackage)) return false;

String url = IntentUtils.safeGetStringExtra(intent, ShortcutHelper.EXTRA_URL);

- if (TextUtils.isEmpty(url)) return false;

+ if (TextUtils.isEmpty(url)) {

+ // No custom URL specified. WebAPK will open at start URL.

+ return WebApkValidator.isValidWebApk(this, webApkPackage);

+ }

if (!webApkPackage.equals(WebApkValidator.queryWebApkPackage(this, url))) {

Log.d(TAG, "%s is not within scope of %s WebAPK", url, webApkPackage);