|
45 | 45 | import io.flutter.run.FlutterLaunchMode;
|
46 | 46 | import io.flutter.run.common.RunMode;
|
47 | 47 | import io.flutter.settings.FlutterSettings;
|
48 |
| -import io.flutter.utils.*; |
| 48 | +import io.flutter.utils.MostlySilentColoredProcessHandler; |
| 49 | +import io.flutter.utils.ProgressHelper; |
| 50 | +import io.flutter.utils.StreamSubscription; |
| 51 | +import io.flutter.utils.UrlUtils; |
| 52 | +import io.flutter.utils.VmServiceListenerAdapter; |
49 | 53 | import io.flutter.vmService.ServiceExtensions;
|
50 | 54 | import io.flutter.vmService.VMServiceManager;
|
51 | 55 | import org.dartlang.vm.service.VmService;
|
|
55 | 59 |
|
56 | 60 | import java.io.File;
|
57 | 61 | import java.net.MalformedURLException;
|
58 |
| -import java.net.URL; |
59 |
| -import java.util.*; |
60 |
| -import java.util.concurrent.*; |
| 62 | +import java.net.URI; |
| 63 | +import java.net.URISyntaxException; |
| 64 | +import java.util.ArrayList; |
| 65 | +import java.util.EventListener; |
| 66 | +import java.util.HashMap; |
| 67 | +import java.util.List; |
| 68 | +import java.util.Map; |
| 69 | +import java.util.concurrent.CompletableFuture; |
| 70 | +import java.util.concurrent.Future; |
| 71 | +import java.util.concurrent.FutureTask; |
| 72 | +import java.util.concurrent.TimeUnit; |
| 73 | +import java.util.concurrent.TimeoutException; |
61 | 74 | import java.util.concurrent.atomic.AtomicReference;
|
62 | 75 | import java.util.function.Consumer;
|
63 | 76 |
|
@@ -765,12 +778,12 @@ public void onAppDebugPort(@NotNull DaemonEvent.AppDebugPort debugInfo) {
|
765 | 778 | if (uri.startsWith("file:")) {
|
766 | 779 | // Convert the file: url to a path.
|
767 | 780 | try {
|
768 |
| - uri = new URL(uri).getPath(); |
| 781 | + uri = new URI(uri).toURL().getPath(); |
769 | 782 | if (uri.endsWith(File.separator)) {
|
770 | 783 | uri = uri.substring(0, uri.length() - 1);
|
771 | 784 | }
|
772 | 785 | }
|
773 |
| - catch (MalformedURLException e) { |
| 786 | + catch (IllegalArgumentException | MalformedURLException | URISyntaxException e) { |
774 | 787 | // ignore
|
775 | 788 | }
|
776 | 789 | }
|
@@ -844,7 +857,8 @@ private void sendDtdRequest(@NotNull DtdRequest dtdRequest, @NotNull JsonObject
|
844 | 857 | final JsonPrimitive type = result != null ? result.getAsJsonPrimitive("type") : null;
|
845 | 858 | if (type != null && "Success".equals(type.getAsString())) {
|
846 | 859 | LOG.info("Successful request " + dtdRequest.type + " to DTD with params: " + initialParams);
|
847 |
| - } else { |
| 860 | + } |
| 861 | + else { |
848 | 862 | LOG.warn("Failed request " + dtdRequest.type + "to DTD with params: " + initialParams);
|
849 | 863 | LOG.warn("Result: " + result);
|
850 | 864 | }
|
|
0 commit comments