mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-08 20:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AndroidManifest.xml: When listening for intents with links, always also listen for HTTPS.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-10 14:13:29 +01:00
parent 9ce9abcc28
commit e24f403cdd
2 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

86
oeffi/AndroidManifest.xml
View file

@ -124,10 +124,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data <data android:host="oeffi.schildbach.de" />
android:host="oeffi.schildbach.de" <data android:pathPrefix="/station/" />
android:pathPrefix="/station/" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -135,10 +135,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="qr.bvg.de" />
android:host="qr.bvg.de" <data android:pathPrefix="/h" />
android:pathPrefix="/h" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -146,10 +146,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="mobil.s-bahn-berlin.de" />
android:host="mobil.s-bahn-berlin.de" <data android:path="/" />
android:path="/" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -157,10 +157,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="wap.rmv.de" />
android:host="wap.rmv.de" <data android:pathPrefix="/mobil/tag/request.do" />
android:pathPrefix="/mobil/tag/request.do" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -168,9 +168,9 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="m.vrn.de" />
android:host="m.vrn.de" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -178,10 +178,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="www.mvg-live.de" />
android:host="www.mvg-live.de" <data android:pathPrefix="/qr" />
android:pathPrefix="/qr" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -189,10 +189,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="www.rheinbahn.de" />
android:host="www.rheinbahn.de" <data android:pathPrefix="/QRBarcode/HS" />
android:pathPrefix="/QRBarcode/HS" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -200,10 +200,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="mobil.vvs.de" />
android:host="mobil.vvs.de" <data android:pathPrefix="/mob/DMR" />
android:pathPrefix="/mob/DMR" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
<intent-filter android:label="@string/stations_station_details_intentfilter_title" > <intent-filter android:label="@string/stations_station_details_intentfilter_title" >
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -211,10 +211,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="m.qando.at" />
android:host="m.qando.at" <data android:pathPrefix="/qr" />
android:pathPrefix="/qr" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
@ -228,10 +228,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="www.rmv.de" />
android:host="www.rmv.de" <data android:pathPrefix="/t/d" />
android:pathPrefix="/t/d" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
@ -304,10 +304,10 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data <data android:host="maps.google.com" />
android:host="maps.google.com" <data android:pathPrefix="/maps" />
android:pathPrefix="/maps" <data android:scheme="http" />
android:scheme="http" /> <data android:scheme="https" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity

2
oeffi/src/de/schildbach/oeffi/util/LocationUriParser.java
View file

@ -45,7 +45,7 @@ public class LocationUriParser {
final String host = uri.getHost(); final String host = uri.getHost();
final String query = uri.getQuery(); final String query = uri.getQuery();
if ("http".equals(scheme) && "maps.google.com".equals(host)) { if (("http".equals(scheme) || "https".equals(scheme)) && "maps.google.com".equals(host)) {
final String q = getQueryParameter(query, "q"); final String q = getQueryParameter(query, "q");
final String saddr = getQueryParameter(query, "saddr"); final String saddr = getQueryParameter(query, "saddr");