From 1fb3ba6e3fa57904bdde486d5f6bb793be788f71 Mon Sep 17 00:00:00 2001 From: andrewrasch Date: Tue, 21 Sep 2021 22:10:38 -0400 Subject: [PATCH 1/2] Update link handling for amp and v.redd.it Added manifest entries for google.com amp links (reddit only) and v.redd.it. Updated handling of google amp links in LinkResolverActivity. --- app/src/main/AndroidManifest.xml | 7 +++++++ .../activities/LinkResolverActivity.java | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 78090f43..f17f60e8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -276,6 +276,13 @@ + + diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java index a6596edb..a9049cfb 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/LinkResolverActivity.java @@ -50,6 +50,7 @@ public class LinkResolverActivity extends AppCompatActivity { private static final String IMGUR_IMAGE_PATTERN = "/\\w+/?"; private static final String RPAN_BROADCAST_PATTERN = "/rpan/r/[\\w-]+/\\w+/?\\w+/?"; private static final String WIKI_PATTERN = "/[rR]/[\\w-]+/(wiki|w)/?\\w+"; + private static final String GOOGLE_AMP_PATTERN = "/amp/s/amp.reddit.com/.*"; @Inject @Named("default") @@ -266,6 +267,13 @@ public class LinkResolverActivity extends AppCompatActivity { } else { deepLinkError(uri); } + } else if (authority.contains("google.com") ){ + if ( path.matches(GOOGLE_AMP_PATTERN) ) { + String url = path.substring(11, path.length()); // skipping past amp straight to reddit + handleUri(Uri.parse("https://" + url)); + } else { + deepLinkError(uri); + } } else { deepLinkError(uri); } From cac32b4394c6b924ff44e06da3e190520cb8cd48 Mon Sep 17 00:00:00 2001 From: andrewrasch Date: Wed, 22 Sep 2021 01:00:53 -0400 Subject: [PATCH 2/2] Added path patterns to other links Fixes bug where only google amp links open in Infinity --- app/src/main/AndroidManifest.xml | 71 +++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f17f60e8..e709293f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -272,77 +272,100 @@ + android:scheme="https" + android:pathPattern=".*"/> + android:scheme="https" + android:pathPattern=".*" /> + android:pathPattern="/amp/s/amp.reddit.com/.*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="https" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" /> + android:scheme="http" + android:pathPattern=".*" />