From 58af3557e846687d17ace088574b9a6b9b2633e0 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 22 Sep 2020 23:41:57 +0800
Subject: Support Chrome Custom Tabs in Android 11.

---
 app/src/main/AndroidManifest.xml                   |  7 +++++
 .../Activity/LinkResolverActivity.java             | 34 +++-------------------
 2 files changed, 11 insertions(+), 30 deletions(-)

(limited to 'app')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bcabf59..005b72c8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="ml.docilealligator.infinityforreddit">
 
+    <queries>
+        <intent>
+            <action android:name=
+                "android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
index 241d47a6..9706d015 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
@@ -271,40 +271,14 @@ public class LinkResolverActivity extends AppCompatActivity {
                 Toast.makeText(this, R.string.no_browser_found, Toast.LENGTH_SHORT).show();
             }
         }
-
-        /*List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
-        ArrayList<String> packageNames = new ArrayList<>();
-
-        String currentPackageName = getApplicationContext().getPackageName();
-
-        for (ResolveInfo info : activities) {
-            if (!info.activityInfo.packageName.equals(currentPackageName)) {
-                packageNames.add(info.activityInfo.packageName);
-            }
-        }
-
-        if (!packageNames.isEmpty()) {
-            try {
-                startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                if (handleError) {
-                    openInCustomTabs(uri, pm, false);
-                } else {
-                    Toast.makeText(this, R.string.no_browser_found, Toast.LENGTH_SHORT).show();
-                }
-            }
-        } else {
-            if (handleError) {
-                openInCustomTabs(uri, pm, false);
-            } else {
-                Toast.makeText(this, R.string.no_browser_found, Toast.LENGTH_SHORT).show();
-            }
-        }*/
     }
 
     private ArrayList<ResolveInfo> getCustomTabsPackages(PackageManager pm) {
         // Get default VIEW intent handler.
-        Intent activityIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.example.com"));
+        Intent activityIntent = new Intent()
+                .setAction(Intent.ACTION_VIEW)
+                .addCategory(Intent.CATEGORY_BROWSABLE)
+                .setData(Uri.fromParts("http", "", null));
 
         // Get all apps that can handle VIEW intents.
         List<ResolveInfo> resolvedActivityList = pm.queryIntentActivities(activityIntent, 0);
-- 
cgit v1.2.3