[Android] Handle each scheme separately
Edward Wang
git at videolan.org
Mon Jul 9 01:11:27 CEST 2012
android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Jul 8 18:53:13 2012 -0400| [a86d5a51839274a4063b0154740f840bf8ffa006] | committer: Edward Wang
Handle each scheme separately
Apparently the android:schemes were interfering with each other, so clicking on rtsp:// links wouldn't work as the filter was trying to match rtsp:// _AND_ rtp:// _AND_ etc, which is absurd.
Tested and verified on Android 2.1 and 4.0.
Close #5002
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=a86d5a51839274a4063b0154740f840bf8ffa006
---
vlc-android/AndroidManifest.xml | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 0d6eff2..274615d 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -75,19 +75,50 @@
<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:mimeType="video/*" />
<data android:mimeType="audio/*" />
<data android:scheme="http" />
- <data android:scheme="icyx" />
<data android:scheme="https" />
- <data android:scheme="rtp" />
+ <data android:scheme="file" />
+ </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="rtsp" />
+ </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="rtmp" />
- <data android:scheme="file" />
+ </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="rtp" />
+ </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="mms" />
+ </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="mmsh" />
</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="icyx" />
+ </intent-filter>
</activity>
<activity
android:name=".gui.audio.AudioBrowserFragment"
More information about the Android
mailing list