From c9056a2dbecd3b5180b6162241437b58bbc49d92 Mon Sep 17 00:00:00 2001
From: Hugh Daschbach <hugh@ccss.com>
Date: Sat, 4 Nov 2023 00:48:13 -0700
Subject: [PATCH] Fix Android 14 authentication breakage.

Workaround to fix issue #148: authentication failure to redirect back
to FFA.

Google issue tracker: https://issuetracker.google.com/issues/210886001

Workaround suggested by AppAuth:
https://github.com/openid/AppAuth-Android/issues/977#issuecomment-1785604118
---
 app/src/main/AndroidManifest.xml         | 8 +++++++-
 app/src/main/res/values-v33/integers.xml | 7 +++++++
 app/src/main/res/values/integers.xml     | 5 +++++
 changes/changelog.d/148.workaround       | 1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-v33/integers.xml
 create mode 100644 app/src/main/res/values/integers.xml
 create mode 100644 changes/changelog.d/148.workaround

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 62f7deb..55ca862 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -56,6 +57,11 @@
             android:name=".activities.LicencesActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="net.openid.appauth.AuthorizationManagementActivity"
+            android:launchMode="@integer/launch_mode_for_app_auth"
+            tools:replace="android:launchMode" />
+
         <service
             android:name=".playback.PlayerService"
             android:foregroundServiceType="mediaPlayback"
diff --git a/app/src/main/res/values-v33/integers.xml b/app/src/main/res/values-v33/integers.xml
new file mode 100644
index 0000000..a93a08f
--- /dev/null
+++ b/app/src/main/res/values-v33/integers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- LAUNCH_SINGLE_INSTANCE -> overrides library mode because of
+     bug in Android 14 (34) which causes infinite loop
+     should be fixed soon with version 14.1 -->
+    <integer name="launch_mode_for_app_auth">3</integer>
+</resources>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 0000000..4c86df1
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- LAUNCH_SINGLE_TASK -> default value from library -->
+    <integer name="launch_mode_for_app_auth">2</integer>
+</resources>
diff --git a/changes/changelog.d/148.workaround b/changes/changelog.d/148.workaround
new file mode 100644
index 0000000..7375e50
--- /dev/null
+++ b/changes/changelog.d/148.workaround
@@ -0,0 +1 @@
++ Workaround Android 14 authentication breakage.  Issue #148 (contributed by hdasch)