Handle all URLs

This commit is contained in:
Thomas 2020-04-18 17:44:34 +02:00
parent f5063fef50
commit ccf53f794e
3 changed files with 8 additions and 130 deletions

View File

@ -39,64 +39,7 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- SHORTENED URLs -->
<data android:host="t.co" />
<data android:host="nyti.ms" />
<data android:host="bit.ly" />
<data android:host="tinyurl.com" />
<data android:host="goo.gl" />
<data android:host="ow.ly" />
<data android:host="bl.ink" />
<data android:host="buff.ly" />
<!-- INSTAGRAM URLs -->
<data android:host="instagram.com" />
<data android:host="www.instagram.com" />
<data android:host="m.instagram.com" />
<!-- TWITTER URLs -->
<data android:host="mobile.twitter.com" />
<data android:host="www.twitter.com" />
<data android:host="twitter.com" />
<data android:host="pbs.twimg.com" />
<data android:host="pic.twitter.com" />
<!-- YOUTUBE URLs -->
<data android:host="www.youtube.com" />
<data android:host="m.youtube.com" />
<data android:host="youtube.com" />
<data android:host="youtu.be" />
<data android:host="youtube-nocookie.com" />
<!-- INVIDIOUS INSTANCES -->
<data android:host="invidio.us" />
<data android:host="invidious.snopyta.org" />
<data android:host="invidiou.sh" />
<data android:host="invidious.toot.koeln" />
<data android:host="invidious.ggc-project.de" />
<data android:host="invidious.13ad.de" />
<data android:host="yewtu.be" />
<!-- NITTER INSTANCES -->
<data android:host="nitter.net" />
<data android:host="nitter.snopyta.org" />
<data android:host="nitter.42l.fr" />
<data android:host="nitter.nixnet.services" />
<data android:host="nitter.13ad.de" />
<data android:host="tw.openalgeria.org" />
<data android:host="nitter.pussthecat.org" />
<data android:host="nitter.mastodont.cat" />
<data android:host="nitter.dark.fail" />
<data android:host="nitter.tedomum.net" />
<!-- BIBLIOGRAM INSTANCES -->
<data android:host="bibliogram.art" />
<data android:host="bibliogram.snopyta.org" />
<data android:host="bibliogram.dsrev.ru" />
<data android:host="bibliogram.pussthecat.org" />
<data android:host="*" />
<data android:pathPattern=".*" />
<data android:scheme="https" />
<data android:scheme="http" />
@ -107,82 +50,12 @@
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<!-- SHORTENED URLs -->
<data android:host="t.co" />
<data android:host="nyti.ms" />
<data android:host="bit.ly" />
<data android:host="tinyurl.com" />
<data android:host="goo.gl" />
<data android:host="ow.ly" />
<data android:host="bl.ink" />
<data android:host="buff.ly" />
<!-- INSTAGRAM URLs -->
<data android:host="instagram.com" />
<data android:host="www.instagram.com" />
<data android:host="m.instagram.com" />
<!-- TWITTER URLs -->
<data android:host="mobile.twitter.com" />
<data android:host="www.twitter.com" />
<data android:host="twitter.com" />
<data android:host="pbs.twimg.com" />
<!-- YOUTUBE URLs -->
<data android:host="www.youtube.com" />
<data android:host="m.youtube.com" />
<data android:host="youtube.com" />
<data android:host="youtu.be" />
<data android:host="youtube-nocookie.com" />
<data android:host="*" />
<data android:mimeType="text/plain" />
</intent-filter>
<!-- MAPS URLs -->
<!-- /maps/ -->
<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:host="*" />
<data android:pathPattern="/maps/place/.*" />
<data android:scheme="https" />
<data android:scheme="http" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="*"
android:mimeType="text/plain"
android:pathPattern="/maps/place/.*" />
</intent-filter>
<!-- AMP URLs -->
<!-- /amp/ -->
<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:host="*" />
<data android:pathPattern="/amp/s/.*" />
<data android:scheme="https" />
<data android:scheme="http" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="*"
android:mimeType="text/plain"
android:pathPattern="/amp/s/.*" />
</intent-filter>
</activity>
<activity
android:name="app.fedilab.nitterizeme.activities.InstanceActivity"

View File

@ -68,6 +68,7 @@ import static app.fedilab.nitterizeme.helpers.Utils.bibliogramAccountPattern;
import static app.fedilab.nitterizeme.helpers.Utils.bibliogramPostPattern;
import static app.fedilab.nitterizeme.helpers.Utils.maps;
import static app.fedilab.nitterizeme.helpers.Utils.nitterPattern;
import static app.fedilab.nitterizeme.helpers.Utils.remove_tracking_param;
import static app.fedilab.nitterizeme.helpers.Utils.transformUrl;
import static app.fedilab.nitterizeme.helpers.Utils.youtubePattern;
@ -304,6 +305,10 @@ public class TransformActivity extends Activity {
} else {
forwardToBrowser(intent);
}
} else {
String newUrl = remove_tracking_param(url);
intent.setData(Uri.parse(newUrl));
forwardToBrowser(intent);
}
}

View File

@ -291,7 +291,7 @@ public class Utils {
* @param url String URL
* @return cleaned URL String
*/
private static String remove_tracking_param(String url) {
public static String remove_tracking_param(String url) {
if (url != null) {
for (String utm : UTM_PARAMS) {
url = url.replaceAll("&amp;" + utm + "=[0-9a-zA-Z._-]*", "");