From 3c1e64d8dc35e22b5327fbd1e2664c7826067c8c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 1 Jan 2016 23:17:39 +0100
Subject: [PATCH] simplify youtube URL IntentFilters

Each <data> elements applies to the whole IntentFilter, so there is no need
to declare the host, scheme, etc. multiple times within a single
IntentFilter.

Also, pathPrefix="/" will match all paths, so it is unnecessary.
---
 app/src/main/AndroidManifest.xml | 53 ++++++++++++--------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f562698d..ab3ceaf9b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,43 +29,30 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
+
             <intent-filter>
-                <action android:name="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:host="youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="https"
-                    android:pathPrefix="/"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="http"
-                    android:pathPrefix="/"/>
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:host="m.youtube.com" />
+                <data android:host="www.youtube.com" />
+                <data android:pathPattern="/?*#*/*watch" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPrefix="/" />
             </intent-filter>
         </activity>
         <activity android:name=".PlayVideoActivity"