Do not re-send browser details in the first UIDL request (#14072)

Change-Id: If68c4145f90951f6400ccf4264a481c3531519e7

2 files changed, 3 insertions, 60 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java
index dc4711510e..a1f1513d58 100644
--- a/client/src/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/client/ApplicationConfiguration.java
@@ -221,7 +221,6 @@ public class ApplicationConfiguration implements EntryPoint {
 
     private Map<Integer, Class<? extends ServerConnector>> classes = new HashMap<Integer, Class<? extends ServerConnector>>();
 
-    private boolean browserDetailsSent = false;
     private boolean widgetsetVersionSent = false;
     private static boolean moduleLoaded = false;
 
@@ -402,11 +401,6 @@ public class ApplicationConfiguration implements EntryPoint {
         communicationError = jsoConfiguration.getConfigError("comErrMsg");
         authorizationError = jsoConfiguration.getConfigError("authErrMsg");
         sessionExpiredError = jsoConfiguration.getConfigError("sessExpMsg");
-
-        // boostrap sets initPending to false if it has sent the browser details
-        if (jsoConfiguration.getConfigBoolean("initPending") == Boolean.FALSE) {
-            setBrowserDetailsSent();
-        }
     }
 
     /**
@@ -783,33 +777,10 @@ public class ApplicationConfiguration implements EntryPoint {
     }
 
     /**
-     * Checks whether information from the web browser (e.g. uri fragment and
-     * screen size) has been sent to the server.
-     * 
-     * @return <code>true</code> if browser information has already been sent
-     * 
-     * @see ApplicationConnection#getNativeBrowserDetailsParameters(String)
-     */
-    public boolean isBrowserDetailsSent() {
-        return browserDetailsSent;
-    }
-
-    /**
-     * Registers that the browser details have been sent.
-     * {@link #isBrowserDetailsSent()} will return
-     * <code> after this method has been invoked.
-     */
-    public void setBrowserDetailsSent() {
-        browserDetailsSent = true;
-    }
-
-    /**
      * Checks whether the widget set version has been sent to the server. It is
      * sent in the first UIDL request.
      * 
      * @return <code>true</code> if browser information has already been sent
-     * 
-     * @see ApplicationConnection#getNativeBrowserDetailsParameters(String)
      */
     public boolean isWidgetsetVersionSent() {
         return widgetsetVersionSent;
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 94fa3c3c01..a2c1d11a7d 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- *
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
@@ -760,31 +760,11 @@ public class ApplicationConnection implements HasHandlers {
     }
 
     private String getRepaintAllParameters() {
-        // collect some client side data that will be sent to server on
-        // initial uidl request
-        String nativeBootstrapParameters = getNativeBrowserDetailsParameters(getConfiguration()
-                .getRootPanelId());
-        // TODO figure out how client and view size could be used better on
-        // server. screen size can be accessed via Browser object, but other
-        // values currently only via transaction listener.
         String parameters = ApplicationConstants.URL_PARAMETER_REPAINT_ALL
-                + "=1&" + nativeBootstrapParameters;
+                + "=1";
         return parameters;
     }
 
-    /**
-     * Gets the browser detail parameters that are sent by the bootstrap
-     * javascript for two-request initialization.
-     * 
-     * @param parentElementId
-     * @return
-     */
-    private static native String getNativeBrowserDetailsParameters(
-            String parentElementId)
-    /*-{
-       return $wnd.vaadin.getBrowserDetailsParameters(parentElementId);
-    }-*/;
-
     protected void repaintAll() {
         makeUidlRequest(new JSONArray(), getRepaintAllParameters());
     }
@@ -2710,15 +2690,7 @@ public class ApplicationConnection implements HasHandlers {
             lastInvocationTag = 0;
         }
 
-        // Include the browser detail parameters if they aren't already sent
-        String extraParams;
-        if (!getConfiguration().isBrowserDetailsSent()) {
-            extraParams = getNativeBrowserDetailsParameters(getConfiguration()
-                    .getRootPanelId());
-            getConfiguration().setBrowserDetailsSent();
-        } else {
-            extraParams = "";
-        }
+        String extraParams = "";
         if (!getConfiguration().isWidgetsetVersionSent()) {
             if (!extraParams.isEmpty()) {
                 extraParams += "&";