From ddc63a0bc971dbb533e54935648c73cf87039993 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 28 Nov 2024 10:53:29 +0300
Subject: fix custom tabs on android 11+, bump gradle plugin to deal with
 android 11 manifest elements, bump version tag

---
 build.gradle                                                  |  2 +-
 org.fox.ttrss/src/main/AndroidManifest.xml                    | 11 +++++++++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java |  6 +++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index bf070ee1..556cc4f7 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.4'
     }
 }
 
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 63cf6b00..d7ca70fe 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="549"
-    android:versionName="1.315">
+    android:versionCode="550"
+    android:versionName="1.316">
+
+    <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.ACCESS_NETWORK_STATE" />
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 469068dc..e8d00285 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -271,9 +271,11 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 
 		String customTabPackageName = getCustomTabPackageName(this);
 
-		CustomTabsClient.bindCustomTabsService(this, customTabPackageName != null ?
+		boolean customTabServiceBound = CustomTabsClient.bindCustomTabsService(this, customTabPackageName != null ?
 				customTabPackageName : "com.android.chrome", m_customTabServiceConnection);
 
+		Log.d(TAG, "customTabServiceBound=" + customTabServiceBound + "; package name=" + customTabPackageName);
+
 		super.onCreate(savedInstanceState);
 	}
 
@@ -497,6 +499,8 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 
 		final Uri finalUri = uri;
 
+		Log.d(TAG, "openUri=" + uri + "; enableCustomTabs=" + enableCustomTabs + "; customTabClient=" + m_customTabClient);
+
 		if (enableCustomTabs && m_customTabClient != null) {
 
 			if (askEveryTime) {
-- 
cgit v1.2.3-54-g00ecf