about summary refs log tree commit diff stats
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2024-11-28 10:53:29 +0300
committerAndrew Dolgov <fox@fakecake.org>2024-11-28 10:53:29 +0300
commitddc63a0bc971dbb533e54935648c73cf87039993 (patch)
tree883ea98d96fbda9b6c4bb78e051f975a53c778d2 /org.fox.ttrss
parent825f69185febb52cdcd370be0e20e059763f042f (diff)
downloadtt-rss-android-ddc63a0b.tar.gz
tt-rss-android-ddc63a0b.tar.xz
fix custom tabs on android 11+, bump gradle plugin to deal with android 11 manifest elements, bump version tag ddc63a0b
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml11
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java6
2 files changed, 14 insertions, 3 deletions
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) {