Upstream: Launch WebApkActivity from WebAPK.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ skipping 11 matching lines @@
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.base.StreamUtil;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.metrics.WebappUma;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tab.TopControlsVisibilityDelegate;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content.browser.ScreenOrientationProvider;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.net.NetworkChangeNotifier;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Displays a webapp in a nearly UI-less Chrome (InfoBars still appear).
  */
 public class WebappActivity extends FullScreenActivity {
     public static final String WEBAPP_SCHEME = "webapp";
 
     private static final String TAG = "WebappActivity";
     private static final long MS_BEFORE_NAVIGATING_BACK_FROM_INTERSTITIAL = 1000;
 
-    private final WebappInfo mWebappInfo;
     private final WebappDirectoryManager mDirectoryManager;
 
+    private WebappInfo mWebappInfo;
+    private boolean mIsWebApk;
+
     private boolean mOldWebappCleanupStarted;
 
     private ViewGroup mSplashScreen;
     private WebappUrlBar mUrlBar;
 
     private boolean mIsInitialized;
     private Integer mBrandColor;
 
     private WebappUma mWebappUma;
 
@@ skipping 13 matching lines @@
     @Override
     protected void onNewIntent(Intent intent) {
         if (intent == null) return;
         super.onNewIntent(intent);
 
         WebappInfo newWebappInfo = WebappInfo.create(intent);
         if (newWebappInfo == null) {
             Log.e(TAG, "Failed to parse new Intent: " + intent);
             finish();
         } else if (!TextUtils.equals(mWebappInfo.id(), newWebappInfo.id())) {
-            mWebappInfo.copy(newWebappInfo);
+            mWebappInfo = newWebappInfo;
+            mIsWebApk = isWebApk(mWebappInfo);
             resetSavedInstanceState();
             if (mIsInitialized) initializeUI(null);
         }
     }
 
     private void initializeUI(Bundle savedInstanceState) {
         // We do not load URL when restoring from saved instance states.
         if (savedInstanceState == null && mWebappInfo.isInitialized()) {
             if (TextUtils.isEmpty(getActivityTab().getUrl())) {
                 getActivityTab().loadUrl(new LoadUrlParams(
                         mWebappInfo.uri().toString(), PageTransition.AUTO_TOPLEVEL));
             }
         } else {
             if (NetworkChangeNotifier.isOnline()) getActivityTab().reloadIgnoringCache();
         }
 
         getActivityTab().addObserver(createTabObserver());
         getActivityTab().getTabWebContentsDelegateAndroid().setDisplayMode(
                 WebDisplayMode.Standalone);
     }
 
     @Override
     public void preInflationStartup() {
         WebappInfo info = WebappInfo.create(getIntent());
-        if (info != null) mWebappInfo.copy(info);
+        if (info != null) {
+            mWebappInfo = info;
+            mIsWebApk = isWebApk(info);
+        }
 
         ScreenOrientationProvider.lockOrientation((byte) mWebappInfo.orientation(), this);
         super.preInflationStartup();
     }
 
     @Override
     public void finishNativeInitialization() {
         if (!mWebappInfo.isInitialized()) finish();
         super.finishNativeInitialization();
         initializeUI(getSavedInstanceState());
@@ skipping 64 matching lines @@
 
         // Kick off the old web app cleanup (if we haven't already) now that we have queued the
         // current web app's storage to be opened.
         if (!mOldWebappCleanupStarted) {
             WebappRegistry.unregisterOldWebapps(this, System.currentTimeMillis());
             mOldWebappCleanupStarted = true;
         }
     }
 
     @Override
+    public void onPause() {
+        super.onPause();
+        // TODO(hanxi): Change onResumeWithNative behaviour so this isn't necessary.
+        if (mIsWebApk) {
+            getIntent().removeExtra(ShortcutHelper.EXTRA_URL);
+        }
+    }
+
+    @Override
     public void onResumeWithNative() {
         super.onResumeWithNative();
+        if (getIntent() != null && mIsWebApk) {

[pkotwicz, 2016/05/18 23:00:17]

- Is this change alone sufficient or does there also need to be a change in
ChromeServiceTabLauncher?
- Based on reading the Api description of Activity#onNewIntent() it sounds like
this code should be there instead

[Xi Han, 2016/05/19 18:31:49]

This makes WebAPK can load different URL in the Intent, and notification is only
one special case, other cases like opening a link in google search result. The
changes in ChromeServiceTabLauncher aim to fix a notification bug, so we can
include that in a following CL, after upstreaming notification related code.

I can't remember why this code is in here, not in onNewIntent(). Yaron and I
have some discussion about it, it might related to some bug we found. Now it
looks ok to me to move it back to onNewIntent().

+            // We could bring a WebAPK hosted WebappActivity to foreground and navigate it to a
+            // different URL. For example, WebAPK "foo" is launched and navigates to
+            // "www.foo.com/foo". A notification comes in with a link "www.foo.com/bar" with falls
+            // in the scope of WebAPK "foo". After clicking the notification, WebAPK "foo" will be
+            //  brought to foreground and navigates to "www.foo.com/bar".
+            //  The extra {@link ShortcutHelper.EXTRA_URL} provides the URL that the WebAPK will
+            //  navigate to.
+            String overrideUrl = getIntent().getStringExtra(ShortcutHelper.EXTRA_URL);
+            if (overrideUrl != null && getActivityTab() != null
+                    && !overrideUrl.equals(getActivityTab().getUrl())) {
+                getActivityTab().loadUrl(
+                        new LoadUrlParams(overrideUrl, PageTransition.AUTO_TOPLEVEL));
+            }
+        }
         mWebappUma.commitMetrics();
     }
 
     @Override
     protected int getControlContainerLayoutId() {
         return R.layout.webapp_control_container;
     }
 
     @Override
     public void postInflationStartup() {
@@ skipping 23 matching lines @@
         contentView.addView(mSplashScreen);
 
         mWebappUma.splashscreenVisible();
         mWebappUma.recordSplashscreenBackgroundColor(mWebappInfo.hasValidBackgroundColor()
                 ? WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM
                 : WebappUma.SPLASHSCREEN_COLOR_STATUS_DEFAULT);
         mWebappUma.recordSplashscreenThemeColor(mWebappInfo.hasValidThemeColor()
                 ? WebappUma.SPLASHSCREEN_COLOR_STATUS_CUSTOM
                 : WebappUma.SPLASHSCREEN_COLOR_STATUS_DEFAULT);
 
+        if (mIsWebApk) {

[pkotwicz, 2016/05/18 23:00:17]

Can we introduce this change in a followup CL?

[Xi Han, 2016/05/19 18:31:49]

I intent to add this here, since it is a bug fix.

+            // TODO(hanxi): Removes this check when WebAPKs are registered in WebappRegistry.
+            initializeSplashScreenWidgets(backgroundColor, null);
+            return;
+        }
+
         final Intent intent = getIntent();
         WebappRegistry.getWebappDataStorage(this, mWebappInfo.id(),
                 new WebappRegistry.FetchWebappDataStorageCallback() {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
                         if (storage == null) return;
 
                         // The information in the WebappDataStorage may have been purged by the
                         // user clearing their history or not launching the web app recently.
                         // Restore the data if necessary from the intent.
@@ skipping 328 matching lines @@
                 || securityLevel == ConnectionSecurityLevel.SECURITY_WARNING;
         return visible;
     }
 
     // We're temporarily disable CS on webapp since there are some issues. (http://crbug.com/471950)
     // TODO(changwan): re-enable it once the issues are resolved.
     @Override
     protected boolean isContextualSearchAllowed() {
         return false;
     }
+
+    /**
+     * Returns whether {@link info} refers to a WebAPK.
+     * Assumes that WebappLauncherActivity does not create WebappActivities for APKs whose package
+     * starts with WEBAPK_PACKAGE_PREFIX but which are not WebAPKs (due to an incorrect singature).
+     * @param info
+     */
+    private static boolean isWebApk(WebappInfo info) {
+        return info.packageName().startsWith(WebApkConstants.WEBAPK_PACKAGE_PREFIX);

[pkotwicz, 2016/05/18 23:00:17]

Can we fully trust WebappLauncherActivity? So change this to:
return info.webApkPackage() != null;

[Xi Han, 2016/05/19 18:31:49]

Yes, it is better to have this check first.

[pkotwicz, 2016/05/19 21:36:35]

I was actually suggesting removing the prefix checking from this function
entirely and changing this function to

return info.webApkPackage() != null;

[Xi Han, 2016/05/20 14:45:41]

Done.

+    }
 }