Webapp offline dialog handles more network errors

Currently the offline dialog only handles ERR_INTERNET_DISCONNECTED error, and
we would like it to catch up more network errors. A generic message is added
to shown on the dialog.

Bug: 789566
Change-Id: I9c36319241f8754822e6336eca8ae13379edc764
Reviewed-on: https://chromium-review.googlesource.com/803835
Commit-Queue: Xi Han <hanxi@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524066}

chrome/android/java/src/org/chromium/chrome/browser/metrics/WebApkUma.java

@@ -229,6 +229,11 @@ public class WebApkUma {
         RecordHistogram.recordBooleanHistogram("WebApk.WebApkService.BindSuccess", bindSucceeded);
     }
 
+    /** Records the network error code caught when a WebAPK is launched. */
+    public static void recordNetworkErrorWhenLaunch(int errorCode) {
+        RecordHistogram.recordSparseSlowlyHistogram("WebApk.Launch.NetworkError", -errorCode);
+    }
+
     /**
      * Log necessary disk usage and cache size UMAs when WebAPK installation fails.
      */

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

@@ -7,11 +7,11 @@ package org.chromium.chrome.browser.webapps;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.support.annotation.StringRes;
 import android.support.v7.app.AlertDialog;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.net.NetError;
 
 /**
  * A dialog to notify users that WebAPKs and Trusted Web Activities need a network connection to
@@ -25,19 +25,17 @@ public class WebappOfflineDialog {
      * @param activity Activity that will be used for {@link Dialog#show()}.
      * @param appName The name of the Android native client for which the dialog is shown.
      * @param isWebApk Whether the app above is a WebAPK.
+     * @param errorCode The network error code.
      */
-    public void show(final Activity activity, String appName, boolean isWebApk) {
-        @StringRes int messageID = isWebApk
-                ? R.string.webapk_offline_dialog : R.string.webapp_twa_offline_dialog;
+    public void show(final Activity activity, String appName, boolean isWebApk, int errorCode) {
         AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.AlertDialogTheme);
-        builder.setMessage(activity.getString(messageID, appName))
-                .setPositiveButton(R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                ApiCompatibilityUtils.finishAndRemoveTask(activity);
-                            }
-                        });
+        builder.setMessage(getErrorDescription(activity, appName, isWebApk, errorCode))
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ApiCompatibilityUtils.finishAndRemoveTask(activity);
+                    }
+                });
 
         mDialog = builder.create();
         mDialog.setCanceledOnTouchOutside(false);
@@ -48,4 +46,19 @@ public class WebappOfflineDialog {
     public void cancel() {
         mDialog.cancel();
     }
+
+    private String getErrorDescription(
+            Activity activity, String appName, boolean isWebApk, int errorCode) {
+        switch (errorCode) {
+            case NetError.ERR_INTERNET_DISCONNECTED:
+                int messageID = isWebApk ? R.string.webapk_offline_dialog
+                                         : R.string.webapp_twa_offline_dialog;
+                return activity.getString(messageID, appName);
+            case NetError.ERR_TUNNEL_CONNECTION_FAILED:
+                return activity.getString(
+                        R.string.webapp_network_error_message_tunnel_connection_failed);
+            default:
+                return activity.getString(R.string.webapp_cannot_connect_to_site);
+        }
+    }
 }

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

@@ -18,6 +18,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import org.chromium.chrome.browser.metrics.WebApkUma;
 import org.chromium.chrome.browser.metrics.WebappUma;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
@@ -28,6 +29,9 @@ import org.chromium.net.NetworkChangeNotifier;
 
 /** Shows and hides splash screen. */
 class WebappSplashScreenController extends EmptyTabObserver {
+    // No error.
+    public static final int ERROR_OK = 0;
+
     /** Used to schedule splash screen hiding. */
     private CompositorViewHolder mCompositorViewHolder;
 
@@ -144,24 +148,24 @@ class WebappSplashScreenController extends EmptyTabObserver {
             boolean isErrorPage, boolean hasCommitted, boolean isSameDocument,
             boolean isFragmentNavigation, Integer pageTransition, int errorCode,
             int httpStatusCode) {
-        if (mActivityType == WebappActivity.ACTIVITY_TYPE_WEBAPP) return;
+        if (mActivityType == WebappActivity.ACTIVITY_TYPE_WEBAPP || !isInMainFrame) return;
 
         mErrorCode = errorCode;
-
         switch (mErrorCode) {
-            case NetError.ERR_NETWORK_CHANGED:
-                onNetworkChanged(tab);
-                break;
-            case NetError.ERR_INTERNET_DISCONNECTED:
-                onNetworkDisconnected(tab);
-                break;
-            default:
+            case ERROR_OK:
                 if (mOfflineDialog != null) {
                     mOfflineDialog.cancel();
                     mOfflineDialog = null;
                 }
                 break;
+            case NetError.ERR_NETWORK_CHANGED:
+                onNetworkChanged(tab);
+                break;
+            default:
+                onNetworkError(tab, errorCode);
+                break;
         }
+        WebApkUma.recordNetworkErrorWhenLaunch(-errorCode);
     }
 
     protected boolean canHideSplashScreen() {
@@ -181,7 +185,7 @@ class WebappSplashScreenController extends EmptyTabObserver {
         mAllowReloads = false;
     }
 
-    private void onNetworkDisconnected(final Tab tab) {
+    private void onNetworkError(final Tab tab, int errorCode) {
         if (mOfflineDialog != null || tab.getActivity() == null) return;
 
         final NetworkChangeNotifier.ConnectionTypeObserver observer =
@@ -199,8 +203,8 @@ class WebappSplashScreenController extends EmptyTabObserver {
 
         NetworkChangeNotifier.addConnectionTypeObserver(observer);
         mOfflineDialog = new WebappOfflineDialog();
-        mOfflineDialog.show(
-                tab.getActivity(), mAppName, mActivityType == WebappActivity.ACTIVITY_TYPE_WEBAPK);
+        mOfflineDialog.show(tab.getActivity(), mAppName,
+                mActivityType == WebappActivity.ACTIVITY_TYPE_WEBAPK, errorCode);
     }
 
     /** Sets the splash screen layout and sets the splash screen's title and icon. */

chrome/android/java/strings/android_chrome_strings.grd

@@ -3049,6 +3049,12 @@ You must have Bluetooth and Location turned on in order to use the Physical Web.
       <message name="IDS_WEBAPK_NOTIFICATION_CHANNEL_NAME" desc="The visible name of the notification channel of WebAPKs on Android O+.">
         General
       </message>
+      <message name="IDS_WEBAPP_CANNOT_CONNECT_TO_SITE" desc="The message on the dialog shown when launching a WebAPK or a TWA with network failure.">
+        Can't connect to the site
+      </message>
+      <message name="IDS_WEBAPP_NETWORK_ERROR_MESSAGE_TUNNEL_CONNECTION_FAILED" desc="The error message for ERROR_TUNNEL_CONNECTION_FAILED.">
+        Establishing a tunnel via proxy server failed
+      </message>
 
       <!-- Keyboard shortcuts in Android N-->
       <message name="IDS_KEYBOARD_SHORTCUT_OPEN_NEW_TAB" desc="A text label that appears next to the keyboard shortcut to open a new tab in Chrome. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">

tools/metrics/histograms/histograms.xml

@@ -94504,6 +94504,15 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="WebApk.Launch.NetworkError" enum="NetErrorCodes">
+  <owner>hanxi@chromium.org</owner>
+  <owner>pkotwicz@chromium.org</owner>
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Records the error codes when a WebAPK is launched with network failures.
+  </summary>
+</histogram>
+
 <histogram name="WebApk.LaunchInterval" units="ms">
   <owner>hanxi@chromium.org</owner>
   <owner>pkotwicz@chromium.org</owner>