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

Fix subscription deeplink (#7295) 

- Properly extract url parameter
- Remove prefix before looking it up in the database
This commit is contained in:
ByteHamster 2024-07-19 23:49:55 +02:00 committed by GitHub
parent 3fe187eea5
commit 154099ef9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
View File

@ -115,7 +115,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
username = savedInstanceState.getString("username"); username = savedInstanceState.getString("username");
password = savedInstanceState.getString("password"); password = savedInstanceState.getString("password");
} }
lookupUrlAndDownload(feedUrl); lookupUrlAndDownload(UrlChecker.prepareUrl(feedUrl));
} }
} }

11
app/src/main/java/de/danoeh/antennapod/ui/share/ShareUtils.java
View File

@ -35,12 +35,11 @@ public class ShareUtils {
} }
public static void shareFeedLink(Context context, Feed feed) { public static void shareFeedLink(Context context, Feed feed) {
String text = feed.getTitle() String feedurl = URLEncoder.encode(feed.getDownloadUrl());
+ "\n\n" feedurl = feedurl.replace("htt", "%68%74%74"); // To not confuse users by having a url inside a url
+ "https://antennapod.org/deeplink/subscribe/?url=" String text = feed.getTitle() + "\n\n"
+ URLEncoder.encode(feed.getDownloadUrl()) + "https://antennapod.org/deeplink/subscribe/?url=" + feedurl
+ "&title=" + "&title=" + URLEncoder.encode(feed.getTitle());
+ URLEncoder.encode(feed.getTitle());
shareLink(context, text); shareLink(context, text);
} }

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

@ -56,11 +56,11 @@ public final class UrlChecker {
return prepareUrl(url.substring(AP_SUBSCRIBE.length())); return prepareUrl(url.substring(AP_SUBSCRIBE.length()));
} else if (lowerCaseUrl.contains(AP_SUBSCRIBE_DEEPLINK)) { } else if (lowerCaseUrl.contains(AP_SUBSCRIBE_DEEPLINK)) {
Log.d(TAG, "Removing " + AP_SUBSCRIBE_DEEPLINK); Log.d(TAG, "Removing " + AP_SUBSCRIBE_DEEPLINK);
String removedWebsite = url.substring(url.indexOf("?url=") + "?url=".length()); String query = Uri.parse(url).getQueryParameter("url");
try { try {
return prepareUrl(URLDecoder.decode(removedWebsite, "UTF-8")); return prepareUrl(URLDecoder.decode(query, "UTF-8"));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
return prepareUrl(removedWebsite); return prepareUrl(query);
} }
} else if (!(lowerCaseUrl.startsWith("http://") || lowerCaseUrl.startsWith("https://"))) { } else if (!(lowerCaseUrl.startsWith("http://") || lowerCaseUrl.startsWith("https://"))) {
Log.d(TAG, "Adding http:// at the beginning of the URL"); Log.d(TAG, "Adding http:// at the beginning of the URL");

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

@ -114,6 +114,9 @@ public class UrlCheckerTest {
+ URLEncoder.encode(feed, "UTF-8"))); + URLEncoder.encode(feed, "UTF-8")));
assertEquals(feed, UrlChecker.prepareUrl("http://www.antennapod.org/deeplink/subscribe?url=" assertEquals(feed, UrlChecker.prepareUrl("http://www.antennapod.org/deeplink/subscribe?url="
+ "example.org/podcast.rss")); + "example.org/podcast.rss"));
assertEquals(feed, UrlChecker.prepareUrl("https://antennapod.org/deeplink/subscribe?url=" + feed + "&title=a"));
assertEquals(feed, UrlChecker.prepareUrl("https://antennapod.org/deeplink/subscribe?url="
+ URLEncoder.encode(feed) + "&title=a"));
} }
@Test @Test