Version 1.5.0-dev.4.11

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/mobile/MobileLaunchConfigurationDelegate.java

 /*
  * Copyright (c) 2014, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.tools.debug.core.mobile;
 
 import com.google.dart.engine.utilities.instrumentation.InstrumentationBuilder;
 import com.google.dart.tools.core.mobile.AndroidDebugBridge;
 import com.google.dart.tools.core.mobile.AndroidDevice;
+import com.google.dart.tools.core.mobile.MobileUrlConnectionException;
 import com.google.dart.tools.debug.core.DartDebugCorePlugin;
 import com.google.dart.tools.debug.core.DartLaunchConfigWrapper;
 import com.google.dart.tools.debug.core.DartLaunchConfigurationDelegate;
 import com.google.dart.tools.debug.core.DebugUIHelper;
 import com.google.dart.tools.debug.core.pubserve.PubCallback;
 import com.google.dart.tools.debug.core.pubserve.PubResult;
 import com.google.dart.tools.debug.core.pubserve.PubServeManager;
 import com.google.dart.tools.debug.core.pubserve.PubServeResourceResolver;
 import com.google.dart.tools.debug.core.util.BrowserManager;
 import com.google.dart.tools.debug.core.util.IRemoteConnectionDelegate;
@@ skipping 70 matching lines @@
       if (result.isError()) {
         DebugUIHelper.getHelper().showError(
             "Launch Error",
             "Pub serve communication error: " + result.getErrorMessage());
         return;
       }
 
       try {
         String launchUrl = result.getResult();
         launchOnMobile(launchUrl, true, new NullProgressMonitor());
+      } catch (MobileUrlConnectionException e) {
+        // DartDebugCorePlugin.logError(e);
+        DebugUIHelper.getHelper().showError("Dartium Launch Error", e);
       } catch (CoreException e) {
         DartDebugCorePlugin.logError(e);
-        DebugUIHelper.getHelper().showError("Dartium Launch Error", e.getMessage());
+        DebugUIHelper.getHelper().showError("Dartium Launch Error", e);
       }
     }
 
   };
 
   private DartLaunchConfigWrapper wrapper;
 
   private static final int REMOTE_DEBUG_PORT = 9224;
 
   @Override
@@ skipping 101 matching lines @@
           DartDebugCorePlugin.PLUGIN_ID,
           "No devices detected.\n\nConnect device, enable USB debugging and try again."));
     }
     if (device.getDeviceId() == null) {
       throw new CoreException(new Status(
           IStatus.ERROR,
           DartDebugCorePlugin.PLUGIN_ID,
           "Unauthorized device detected.\n\nAuthorize device and try again."));
     }
 
+    if (!devBridge.isHtmlPageAccessible(device, launchUrl).isOK()) {
+      // pub serve is always localhost over USB while old dev server is always over wifi
+      boolean localhostOverUsb = usePubServe;
+      throw new MobileUrlConnectionException(launchUrl, localhostOverUsb);
+    }
+
     if (wrapper.getInstallContentShell()) {
-      if (!devBridge.installContentShellApk(device.getDeviceId())) {
+      if (!devBridge.installContentShellApk(device)) {
         throw new CoreException(new Status(
             IStatus.ERROR,
             DartDebugCorePlugin.PLUGIN_ID,
             "Failed to install content shell on mobile"));
       }
     }
     devBridge.launchContentShell(device.getDeviceId(), launchUrl);
 
     // check if remote connection is alive
     if (!isRemoteConnected()) {
       devBridge.setupPortForwarding(Integer.toString(REMOTE_DEBUG_PORT));
-      // TODO(keertip): check if host needs to be the ip for wifi connections
+      // wait for content shell to open to get the tabs to connect
+      try {
+        Thread.sleep(500);
+      } catch (InterruptedException e) {
+
+      }
       performRemoteConnection("localhost", REMOTE_DEBUG_PORT, monitor, usePubServe);
     }
   }
 
   private String getUrlFromResourceServer(IResource resource) throws IOException, CoreException,
       URISyntaxException {
 
     ResourceServer server = ResourceServerManager.getServer();
     String resPath = resource.getFullPath().toPortableString();
     String localAddress = server.getLocalAddress();
@@ skipping 21 matching lines @@
           return true;
         }
       } catch (DebugException e) {
 
       }
     }
     return false;
   }
 
 }