From b4de565d9672d7078bb2ca50068a4fbba03b033a Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Tue, 31 Oct 2023 14:35:11 +0100
Subject: [PATCH 1/4] ChromeOS analysis + optional features

---
 analysis_options.yaml                                         | 4 +++-
 android/app/src/main/AndroidManifest.xml                      | 4 ++++
 .../qrscanner_zxing/android/src/main/AndroidManifest.xml      | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 1a10aa782..1186c8a7e 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -31,6 +31,8 @@ linter:
 # https://dart.dev/guides/language/analysis-options
 
 analyzer:
+  optional-checks:
+    chrome-os-manifest-checks
   exclude:
     - "**/*.g.dart"
-    - "**/*.freezed.dart"
\ No newline at end of file
+    - "**/*.freezed.dart"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8a0af79f2..3e88cfef6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -12,6 +12,10 @@
         android:name="android.hardware.nfc"
         android:required="false" />
 
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <uses-feature
         android:name="android.hardware.screen.portrait"
         android:required="false" />
diff --git a/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml b/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml
index 1d0486364..349df9fd4 100644
--- a/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml
+++ b/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml
@@ -8,6 +8,10 @@
         android:name="android.hardware.camera.any"
         android:required="false" />
 
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.CAMERA" />
 
 </manifest>

From d1b9e0047425a20ce160ce728c732039139d620a Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Tue, 31 Oct 2023 14:41:45 +0100
Subject: [PATCH 2/4] optional touchscreen in debug and profile manifests

---
 android/app/src/debug/AndroidManifest.xml   | 4 ++++
 android/app/src/profile/AndroidManifest.xml | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index b56df1768..913629068 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -5,6 +5,10 @@
     -->
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <!-- support ACTION_RUN for debug builds -->
     <application
         android:icon="@mipmap/ic_launcher"
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index f880684a6..b9c761edf 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -3,4 +3,9 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
 </manifest>

From f9b418b8315d141d616683e25d952b7e2ddbcde3 Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Tue, 31 Oct 2023 14:42:30 +0100
Subject: [PATCH 3/4] target API 34

---
 android/app/build.gradle | 2 +-
 android/build.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index df1e31c5f..fa96f1921 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
     defaultConfig {
         applicationId "com.yubico.yubioath"
         minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
+        targetSdk project.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/android/build.gradle b/android/build.gradle
index b6fbeba65..f66b6cd14 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,7 +21,7 @@ allprojects {
 
     project.ext {
         minSdkVersion = 21
-        targetSdkVersion = 33
+        targetSdkVersion = 34
         compileSdkVersion = 34
 
         yubiKitVersion = "2.4.0-beta01"

From 6aa2eef3945f12610741b9ef0adc0e1f67de447d Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Tue, 31 Oct 2023 14:45:50 +0100
Subject: [PATCH 4/4] bump libraries

---
 android/app/build.gradle | 2 +-
 android/build.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index fa96f1921..79804cb13 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -109,7 +109,7 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.6.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
 
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
 
     implementation 'com.github.tony19:logback-android:3.0.0'
 
diff --git a/android/build.gradle b/android/build.gradle
index f66b6cd14..5e5942827 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -26,7 +26,7 @@ allprojects {
 
         yubiKitVersion = "2.4.0-beta01"
         junitVersion = "4.13.2"
-        mockitoVersion = "5.5.0"
+        mockitoVersion = "5.6.0"
     }
 }