[Android WebAPK] Don't navigate WebAPK as a result of WindowClient.focus()

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

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 e30875d3a331c1bbdfff0a3290f591ff735ed751..6e1c64a74e4fb8ff916963b1206005d840a2bb7d 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
@@ -92,10 +92,14 @@ public class MainActivity extends Activity {
         Log.v(TAG, "Package name of the WebAPK:" + packageName);
 
         String runtimeHost = WebApkUtils.getHostBrowserPackageName(this);
-        boolean isFromExternalIntent = (overrideUrl != null);
+        boolean forceNavigation = false;
         int source = getIntent().getIntExtra(WebApkConstants.EXTRA_SOURCE, 0);
-        if (isFromExternalIntent && source == WebApkConstants.SHORTCUT_SOURCE_UNKNOWN) {
-            source = WebApkConstants.SHORTCUT_SOURCE_EXTERNAL_INTENT;
+        if (overrideUrl != null) {
+            if (source == WebApkConstants.SHORTCUT_SOURCE_UNKNOWN) {
+                source = WebApkConstants.SHORTCUT_SOURCE_EXTERNAL_INTENT;
+            }
+            forceNavigation = getIntent().getBooleanExtra(

[Yaron, 2017/05/11 15:00:04]

wait, actually. so this means there are times when a webapk is already loaded
and you get an intent with a url and we won't actually navigate it? that seems
wrong.

[pkotwicz, 2017/05/13 02:53:33]

I tried sending an intent of type Intent.ACTION_MAIN and
Intent.CATEGORY_LAUNCHER and it does not seem to work on Kitkat.

The intent launches the WebAPK if it is not running already but it does not
bring the WebAPK to the foreground if it is running

+                    WebApkConstants.EXTRA_WEBAPK_FORCE_NAVIGATION, true);
         }
 
         // The override URL is non null when the WebAPK is launched from a deep link. The WebAPK
@@ -106,7 +110,7 @@ public class MainActivity extends Activity {
         intent.putExtra(WebApkConstants.EXTRA_URL, startUrl)
                 .putExtra(WebApkConstants.EXTRA_SOURCE, source)
                 .putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, packageName)
-                .putExtra(WebApkConstants.EXTRA_WEBAPK_FORCE_NAVIGATION, isFromExternalIntent);
+                .putExtra(WebApkConstants.EXTRA_WEBAPK_FORCE_NAVIGATION, forceNavigation);
 
         try {
             startActivity(intent);