From 16f37e29e289d0a710525ab52d92f3c1130ba6c4 Mon Sep 17 00:00:00 2001
From: Mahdi Sadeghi <mahdi.sadeghi@skyscanner.net>
Date: Fri, 14 Apr 2023 14:32:21 +0100
Subject: [PATCH] fix "You need to use a Theme.AppCompat theme (or descendant)
 with this activity." error

---
 app/AndroidManifest.xml                                       | 2 --
 .../net/openid/appauth/AuthorizationManagementActivity.java   | 3 +--
 .../java/net/openid/appauth/RedirectUriReceiverActivity.java  | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 9a6ecde5..6c6f6272 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -42,7 +42,6 @@
         <!-- Main activity -->
         <activity
                 android:name=".LoginActivity"
-                android:label="@string/app_name_short"
                 android:theme="@style/AppTheme"
                 android:windowSoftInputMode="stateHidden"
                 android:exported="true">
@@ -54,7 +53,6 @@
 
         <activity
                 android:name=".TokenActivity"
-                android:label="@string/app_name_short"
                 android:theme="@style/AppTheme"
                 android:windowSoftInputMode="stateHidden" >
         </activity>
diff --git a/library/java/net/openid/appauth/AuthorizationManagementActivity.java b/library/java/net/openid/appauth/AuthorizationManagementActivity.java
index fe33d8e0..22ab24ee 100644
--- a/library/java/net/openid/appauth/AuthorizationManagementActivity.java
+++ b/library/java/net/openid/appauth/AuthorizationManagementActivity.java
@@ -23,7 +23,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AppCompatActivity;
 
 import net.openid.appauth.AuthorizationException.AuthorizationRequestErrors;
 import net.openid.appauth.internal.Logger;
@@ -124,7 +123,7 @@
  *       {@link AuthorizationException} as appropriate.
  *       The AuthorizationManagementActivity finishes, removing itself from the back stack.
  */
-public class AuthorizationManagementActivity extends AppCompatActivity {
+public class AuthorizationManagementActivity extends Activity {
 
     @VisibleForTesting
     static final String KEY_AUTH_INTENT = "authIntent";
diff --git a/library/java/net/openid/appauth/RedirectUriReceiverActivity.java b/library/java/net/openid/appauth/RedirectUriReceiverActivity.java
index 6580429a..50ca56bf 100644
--- a/library/java/net/openid/appauth/RedirectUriReceiverActivity.java
+++ b/library/java/net/openid/appauth/RedirectUriReceiverActivity.java
@@ -14,8 +14,8 @@
 
 package net.openid.appauth;
 
+import android.app.Activity;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Activity that receives the redirect Uri sent by the OpenID endpoint. It forwards the data
@@ -42,7 +42,7 @@
  * </intent-filter>
  * ```
  */
-public class RedirectUriReceiverActivity extends AppCompatActivity {
+public class RedirectUriReceiverActivity extends Activity {
 
     @Override
     public void onCreate(Bundle savedInstanceBundle) {