Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a9c7c48 authored by Adam Vartanian's avatar Adam Vartanian Committed by android-build-merger
Browse files

Adjust Uri host parsing to use last instead of first @.

am: cd6228dd

Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
parents edb6b17e cd6228dd
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
                return null;
            }

            int end = authority.indexOf('@');
            int end = authority.lastIndexOf('@');
            return end == NOT_FOUND ? null : authority.substring(0, end);
        }

@@ -1084,7 +1084,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
            }

            // Parse out user info and then port.
            int userInfoSeparator = authority.indexOf('@');
            int userInfoSeparator = authority.lastIndexOf('@');
            int portSeparator = authority.indexOf(':', userInfoSeparator);

            String encodedHost = portSeparator == NOT_FOUND
@@ -1110,7 +1110,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {

            // Make sure we look for the port separtor *after* the user info
            // separator. We have URLs with a ':' in the user info.
            int userInfoSeparator = authority.indexOf('@');
            int userInfoSeparator = authority.lastIndexOf('@');
            int portSeparator = authority.indexOf(':', userInfoSeparator);

            if (portSeparator == NOT_FOUND) {
+5 −0
Original line number Diff line number Diff line
@@ -187,6 +187,11 @@ public class UriTest extends TestCase {
        uri = Uri.parse("http://localhost");
        assertEquals("localhost", uri.getHost());
        assertEquals(-1, uri.getPort());

        uri = Uri.parse("http://a:a@example.com:a@example2.com/path");
        assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
        assertEquals("example2.com", uri.getHost());
        assertEquals(-1, uri.getPort());
    }

    @SmallTest