Skip to content

Remove deprecated constructor java.net.URL.<init>(String) invocations #8319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove deprecated constructor java.net.URL.<init>(String) invocations #8319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions flutter-idea/src/io/flutter/run/daemon/FlutterApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
import org.jetbrains.annotations.Nullable;

import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -748,14 +748,14 @@ public void onAppDebugPort(@NotNull DaemonEvent.AppDebugPort debugInfo) {
String uri = debugInfo.baseUri;
if (uri != null) {
if (uri.startsWith("file:")) {
// Convert the file: url to a path.
// Convert the file: uri to a path.
try {
uri = new URL(uri).getPath();
uri = (new URI(uri).getPath());
if (uri.endsWith(File.separator)) {
uri = uri.substring(0, uri.length() - 1);
}
}
catch (MalformedURLException e) {
catch (URISyntaxException e) {
// ignore
}
}
Expand Down
11 changes: 6 additions & 5 deletions flutter-idea/src/io/flutter/utils/UrlUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.flutter.utils;

import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
import java.net.URISyntaxException;

public class UrlUtils {
public static String generateHtmlFragmentWithHrefTags(String input) {
Expand All @@ -11,9 +11,10 @@ public static String generateHtmlFragmentWithHrefTags(String input) {
builder.append(" ");
}
try {
URL url = new URL(token);
builder.append("<a href=\"").append(url).append("\">").append(url).append("</a>");
} catch(MalformedURLException e) {
final URI uri = new URI(token);
builder.append("<a href=\"").append(uri).append("\">").append(uri).append("</a>");
}
catch (URISyntaxException e) {
builder.append(token);
}
}
Expand Down
Loading