From e6383381e6ba90fba526d57a33332a159edbf25a Mon Sep 17 00:00:00 2001
From: Will Munslow <will@subterrane.com>
Date: Tue, 17 Mar 2026 10:39:39 -0700
Subject: [PATCH] fix: resolve ActivityNotFoundException on Android 11+ by
 declaring browser query intents

Android 11 (API 30) introduced package visibility restrictions that cause
PackageManager.queryIntentActivities() to return an empty list unless the
app declares <queries> for the intents it needs. AppAuth uses this to
discover available browsers, so without the declaration the sign-in flow
crashes with ActivityNotFoundException.

This adds <queries> for VIEW intents with http/https schemes to the library
manifest (automatically merged into consumer apps). Also bumps
compileSdkVersion to 30 and AGP to 4.1.3 (both required for <queries>
element support), and updates the Gradle wrapper to 6.7.1.

Supersedes #22. [no-ado]
---
 app/build.gradle                          |  4 ++--
 appjava/build.gradle                      |  4 ++--
 build.gradle                              |  2 +-
 gradle/wrapper/gradle-wrapper.properties  |  2 +-
 oneloginoidc/build.gradle                 |  6 +++---
 oneloginoidc/src/main/AndroidManifest.xml | 18 +++++++++++++++++-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 45b7794..68ac51f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ def redirectUrl = properties.redirect_url ?: System.getenv('REDIRECT_URL') ?: ""
 def redirectScheme = properties.redirect_scheme ?: System.getenv('REDIRECT_SCHEME') ?: ""
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.onelogin.oidc.demo"
diff --git a/appjava/build.gradle b/appjava/build.gradle
index 33c4fb1..b6cb2e7 100644
--- a/appjava/build.gradle
+++ b/appjava/build.gradle
@@ -12,8 +12,8 @@ def redirectUrl = properties.redirect_url ?: System.getenv('REDIRECT_URL') ?: ""
 def redirectScheme = properties.redirect_scheme ?: System.getenv('REDIRECT_SCHEME') ?: ""
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.onelogin.oidc.appjava"
diff --git a/build.gradle b/build.gradle
index b45158f..e862c52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.2"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17183a6..8ea2565 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/oneloginoidc/build.gradle b/oneloginoidc/build.gradle
index 741dc1e..4276f01 100644
--- a/oneloginoidc/build.gradle
+++ b/oneloginoidc/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'org.jetbrains.dokka'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
diff --git a/oneloginoidc/src/main/AndroidManifest.xml b/oneloginoidc/src/main/AndroidManifest.xml
index 7c7626d..92fb70b 100644
--- a/oneloginoidc/src/main/AndroidManifest.xml
+++ b/oneloginoidc/src/main/AndroidManifest.xml
@@ -1,3 +1,19 @@
-<manifest package="com.onelogin.oidc">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.onelogin.oidc">
+
+    <!-- Required for Android 11+ (API 30) package visibility.
+         Without this, PackageManager.queryIntentActivities() returns an empty
+         list and AppAuth cannot discover available browsers, resulting in
+         ActivityNotFoundException when starting the sign-in flow. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="http" />
+        </intent>
+    </queries>
 
 </manifest>