From 9f363540fbae4df6f7501b5623a991a41323b780 Mon Sep 17 00:00:00 2001 From: txtd Date: Tue, 7 Jan 2020 21:01:29 +0100 Subject: Properly parse subscribeonandroid.com URLs when subscribing to a feed --- .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index a0530fb95..510e8faef 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -134,6 +134,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity { } else { Log.d(TAG, "Activity was started with url " + feedUrl); setLoadingLayout(); + if(feedUrl.contains("subscribeonandroid.com")){ + feedUrl = feedUrl.replaceAll("((www.)?(subscribeonandroid.com/))",""); + } if (savedInstanceState == null) { startFeedDownload(feedUrl, null, null); } else { -- cgit v1.2.3 From 852090059751973e11de0c9806a79fd857cadde2 Mon Sep 17 00:00:00 2001 From: txtd Date: Tue, 7 Jan 2020 21:23:16 +0100 Subject: Use replaceFirst() rather than replaceAll() when parsing subscribe on android URLs --- .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index 510e8faef..a781b4420 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -134,8 +134,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity { } else { Log.d(TAG, "Activity was started with url " + feedUrl); setLoadingLayout(); + //Remove subscribeonandroid.com from feed URL in order to subscribe to the actual feed URL if(feedUrl.contains("subscribeonandroid.com")){ - feedUrl = feedUrl.replaceAll("((www.)?(subscribeonandroid.com/))",""); + feedUrl = feedUrl.replaceFirst("((www.)?(subscribeonandroid.com/))",""); } if (savedInstanceState == null) { startFeedDownload(feedUrl, null, null); -- cgit v1.2.3 From 22797fd7b2e8ee01526d742acec1b3ad994b9e30 Mon Sep 17 00:00:00 2001 From: txtd Date: Tue, 7 Jan 2020 23:02:06 +0100 Subject: Cleanup code --- .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index a781b4420..50a8d0965 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -134,9 +134,9 @@ public class OnlineFeedViewActivity extends AppCompatActivity { } else { Log.d(TAG, "Activity was started with url " + feedUrl); setLoadingLayout(); - //Remove subscribeonandroid.com from feed URL in order to subscribe to the actual feed URL - if(feedUrl.contains("subscribeonandroid.com")){ - feedUrl = feedUrl.replaceFirst("((www.)?(subscribeonandroid.com/))",""); + // Remove subscribeonandroid.com from feed URL in order to subscribe to the actual feed URL + if (feedUrl.contains("subscribeonandroid.com")) { + feedUrl = feedUrl.replaceFirst("((www.)?(subscribeonandroid.com/))", ""); } if (savedInstanceState == null) { startFeedDownload(feedUrl, null, null); -- cgit v1.2.3