From 4636c01d738731f67a23e6d5062a5f7e14167cb5 Mon Sep 17 00:00:00 2001
From: txtd <txtd@users.noreply.github.com>
Date: Tue, 7 Jan 2020 19:33:01 +0100
Subject: Add intent filters for subscribeonandroid.com to manifest

---
 app/src/main/AndroidManifest.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 086206dcd..90299a60f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -297,6 +297,22 @@
                 <data android:scheme="antennapod-subscribe"/>
             </intent-filter>
 
+            <!--Support for subscribeonandroid.com URLS-->
+
+            <intent-filter android:label="android.intent.action.VIEW">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:pathPattern=".*\\..*/.*" />
+                <data android:host="subscribeonandroid.com" />
+                <data android:host="www.subscribeonandroid.com" />
+                <data android:host="*subscribeonandroid.com" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
 
-- 
cgit v1.2.3


From 9f363540fbae4df6f7501b5623a991a41323b780 Mon Sep 17 00:00:00 2001
From: txtd <txtd@users.noreply.github.com>
Date: Tue, 7 Jan 2020 21:01:29 +0100
Subject: Properly parse subscribeonandroid.com URLs when subscribing to a feed

---
 app/src/main/AndroidManifest.xml                                    | 6 +++++-
 .../java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90299a60f..6fec96c9f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -299,7 +299,7 @@
 
             <!--Support for subscribeonandroid.com URLS-->
 
-            <intent-filter android:label="android.intent.action.VIEW">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -311,6 +311,8 @@
                 <data android:host="*subscribeonandroid.com" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
+
+
             </intent-filter>
 
             <intent-filter>
@@ -355,6 +357,8 @@
             </intent-filter>
         </receiver>
 
+
+
         <provider
             android:authorities="@string/provider_authority"
             android:name="androidx.core.content.FileProvider"
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 <txtd@users.noreply.github.com>
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')

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 <txtd@users.noreply.github.com>
Date: Tue, 7 Jan 2020 23:02:06 +0100
Subject: Cleanup code

---
 app/src/main/AndroidManifest.xml                              | 11 +----------
 .../de/danoeh/antennapod/activity/OnlineFeedViewActivity.java |  6 +++---
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6fec96c9f..ad68fcfe3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -236,7 +236,6 @@
                 android:value="de.danoeh.antennapod.activity.MainActivity"/>
 
             <!-- URLs ending with '.xml' or '.rss' -->
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -252,7 +251,6 @@
             </intent-filter>
 
             <!-- Feedburner URLs -->
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -268,7 +266,6 @@
             </intent-filter>
 
             <!-- Files with mimeType rss/xml/atom -->
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -284,7 +281,6 @@
             </intent-filter>
 
             <!-- Podcast protocols -->
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -297,8 +293,7 @@
                 <data android:scheme="antennapod-subscribe"/>
             </intent-filter>
 
-            <!--Support for subscribeonandroid.com URLS-->
-
+            <!-- Support for subscribeonandroid.com URLS -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -311,8 +306,6 @@
                 <data android:host="*subscribeonandroid.com" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
-
-
             </intent-filter>
 
             <intent-filter>
@@ -357,8 +350,6 @@
             </intent-filter>
         </receiver>
 
-
-
         <provider
             android:authorities="@string/provider_authority"
             android:name="androidx.core.content.FileProvider"
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