From 5d08f44888ff3a3e42cfd3b79d686c994f663167 Mon Sep 17 00:00:00 2001
From: Dat PHAM HOANG <dphamhoang@linagora.com>
Date: Mon, 30 Jan 2023 15:01:55 +0700
Subject: [PATCH] Upgrade AppAuth + change theme to fix OIDC flow

---
 android/app/src/main/AndroidManifest.xml   | 2 ++
 android/app/src/main/res/values/styles.xml | 4 ++--
 data/pubspec.yaml                          | 2 +-
 pubspec.lock                               | 4 ++--
 pubspec.yaml                               | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 36e3db3ed..1693d4795 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -31,6 +31,8 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
+        tools:replace="android:theme"
+        android:theme="@style/NormalTheme"
         android:roundIcon="@mipmap/ic_launcher_round">
         <activity
             android:name=".MainActivity"
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 1f83a33fd..923e336d4 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -12,7 +12,7 @@
          running.
          
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">@android:color/white</item>
     </style>
 </resources>
diff --git a/data/pubspec.yaml b/data/pubspec.yaml
index 04185b80c..fcf10185a 100644
--- a/data/pubspec.yaml
+++ b/data/pubspec.yaml
@@ -57,7 +57,7 @@ dependencies:
       ref: master
 
   # OIDC
-  flutter_appauth: 2.1.0+1
+  flutter_appauth: 4.0.0
 
   # uuid
   uuid: 3.0.6
diff --git a/pubspec.lock b/pubspec.lock
index 6412c4942..f5d8ec8b8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -392,14 +392,14 @@ packages:
       name: flutter_appauth
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0+1"
+    version: "4.0.0"
   flutter_appauth_platform_interface:
     dependency: transitive
     description:
       name: flutter_appauth_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "5.2.0"
   flutter_datetime_picker:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 285ba653b..08c6169c9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -115,7 +115,7 @@ dependencies:
   permission_handler: 10.2.0
 
   # OIDC
-  flutter_appauth: 2.1.0+1
+  flutter_appauth: 4.0.0
 
   # datetime picker
   flutter_datetime_picker: 1.5.1