Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UrlChecker on antennapod_local urls (#7191)

This commit is contained in:
ByteHamster 2024-05-22 10:03:59 +02:00 committed by GitHub
parent 5f5d744e71
commit baeb0d8ced
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/common/src/main/java/de/danoeh/antennapod/net/common/UrlChecker.java
View File

@ -5,8 +5,6 @@ import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import android.util.Log; import android.util.Log;
import okhttp3.HttpUrl;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
@ -106,20 +104,23 @@ public final class UrlChecker {
} }
public static boolean urlEquals(String string1, String string2) { public static boolean urlEquals(String string1, String string2) {
HttpUrl url1 = HttpUrl.parse(string1); Uri url1 = Uri.parse(string1);
HttpUrl url2 = HttpUrl.parse(string2); Uri url2 = Uri.parse(string2);
if (!url1.host().equals(url2.host())) { if (url1 == null || url2 == null || url1.getHost() == null || url2.getHost() == null) {
return string1.equals(string2); // Unable to parse url properly
}
if (!url1.getHost().toLowerCase(Locale.ROOT).equals(url2.getHost().toLowerCase(Locale.ROOT))) {
return false; return false;
} }
List<String> pathSegments1 = normalizePathSegments(url1.pathSegments()); List<String> pathSegments1 = normalizePathSegments(url1.getPathSegments());
List<String> pathSegments2 = normalizePathSegments(url2.pathSegments()); List<String> pathSegments2 = normalizePathSegments(url2.getPathSegments());
if (!pathSegments1.equals(pathSegments2)) { if (!pathSegments1.equals(pathSegments2)) {
return false; return false;
} }
if (TextUtils.isEmpty(url1.query())) { if (TextUtils.isEmpty(url1.getQuery())) {
return TextUtils.isEmpty(url2.query()); return TextUtils.isEmpty(url2.getQuery());
} }
return url1.query().equals(url2.query()); return url1.getQuery().equals(url2.getQuery());
} }
/** /**

2
net/common/src/test/java/de/danoeh/antennapod/net/common/UrlCheckerTest.java
View File

@ -162,6 +162,7 @@ public class UrlCheckerTest {
assertTrue(UrlChecker.urlEquals("https://example.com/?", "https://example.com")); assertTrue(UrlChecker.urlEquals("https://example.com/?", "https://example.com"));
assertTrue(UrlChecker.urlEquals("https://Example.com", "https://example.com")); assertTrue(UrlChecker.urlEquals("https://Example.com", "https://example.com"));
assertTrue(UrlChecker.urlEquals("https://example.com/test", "https://example.com/Test")); assertTrue(UrlChecker.urlEquals("https://example.com/test", "https://example.com/Test"));
assertTrue(UrlChecker.urlEquals("antennapod_local:abc", "antennapod_local:abc"));
} }
@Test @Test
@ -171,5 +172,6 @@ public class UrlCheckerTest {
assertFalse(UrlChecker.urlEquals("https://example.com/", "https://otherpodcast.example.com/")); assertFalse(UrlChecker.urlEquals("https://example.com/", "https://otherpodcast.example.com/"));
assertFalse(UrlChecker.urlEquals("https://www.example.com/?id=42&a=b", "https://www.example.com/?id=43&a=b")); assertFalse(UrlChecker.urlEquals("https://www.example.com/?id=42&a=b", "https://www.example.com/?id=43&a=b"));
assertFalse(UrlChecker.urlEquals("https://example.com/podcast%25test", "https://example.com/podcast test")); assertFalse(UrlChecker.urlEquals("https://example.com/podcast%25test", "https://example.com/podcast test"));
assertFalse(UrlChecker.urlEquals("antennapod_local:abc", "https://example.com/"));
} }
} }