From 1374b8d4923a8f3c0ea7e2c5570c6207aa3586fc Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Thu, 9 Mar 2023 20:50:59 +0100
Subject: [PATCH] fixed crash when using fingerprint on Android 8.1

---
 CHANGELOG.md                                  |  1 +
 .../app/src/main/res/values-night/styles.xml  |  2 +-
 android/app/src/main/res/values/styles.xml    |  2 +-
 .../viewer/visual/entry_page_view.dart        | 36 +++++++++++--------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7516ea77..e5eeefb2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file.
 
 - Accessibility: using accessibility services keeping snack bar beyond countdown
 - Accessibility: navigation with TalkBack
+- Vaults: crash when using fingerprint on older Android versions
 
 ## <a id="v1.8.2"></a>[v1.8.2] - 2023-02-28
 
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 25046f02e..edd8ddab8 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">?android:colorBackground</item>
 
         <!-- API28+, draws next to the notch in fullscreen -->
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 0f75fc293..ef426481b 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">?android:colorBackground</item>
 
         <!-- API28+, draws next to the notch in fullscreen -->
diff --git a/lib/widgets/viewer/visual/entry_page_view.dart b/lib/widgets/viewer/visual/entry_page_view.dart
index 2198bce5c..a62f65d13 100644
--- a/lib/widgets/viewer/visual/entry_page_view.dart
+++ b/lib/widgets/viewer/visual/entry_page_view.dart
@@ -240,12 +240,15 @@ class _EntryPageViewState extends State<EntryPageView> with SingleTickerProvider
               onDoubleTap = (alignment) {
                 final x = alignment.x;
                 if (seekGesture) {
-                  if (x < sideRatio) {
-                    _applyAction(EntryAction.videoReplay10);
-                    return true;
-                  } else if (x > 1 - sideRatio) {
-                    _applyAction(EntryAction.videoSkip10);
-                    return true;
+                  final sideRatio = _getSideRatio();
+                  if (sideRatio != null) {
+                    if (x < sideRatio) {
+                      _applyAction(EntryAction.videoReplay10);
+                      return true;
+                    } else if (x > 1 - sideRatio) {
+                      _applyAction(EntryAction.videoSkip10);
+                      return true;
+                    }
                   }
                 }
                 if (playGesture) {
@@ -428,12 +431,15 @@ class _EntryPageViewState extends State<EntryPageView> with SingleTickerProvider
   void _onTap({Alignment? alignment}) {
     if (settings.viewerGestureSideTapNext && alignment != null) {
       final x = alignment.x;
-      if (x < sideRatio) {
-        const ShowPreviousEntryNotification(animate: false).dispatch(context);
-        return;
-      } else if (x > 1 - sideRatio) {
-        const ShowNextEntryNotification(animate: false).dispatch(context);
-        return;
+      final sideRatio = _getSideRatio();
+      if (sideRatio != null) {
+        if (x < sideRatio) {
+          const ShowPreviousEntryNotification(animate: false).dispatch(context);
+          return;
+        } else if (x > 1 - sideRatio) {
+          const ShowNextEntryNotification(animate: false).dispatch(context);
+          return;
+        }
       }
     }
     const ToggleOverlayNotification().dispatch(context);
@@ -481,12 +487,14 @@ class _EntryPageViewState extends State<EntryPageView> with SingleTickerProvider
     );
   }
 
-  double get sideRatio {
-    switch (context.read<MediaQueryData>().orientation) {
+  double? _getSideRatio() {
+    switch (context.read<MediaQueryData?>()?.orientation) {
       case Orientation.portrait:
         return 1 / 5;
       case Orientation.landscape:
         return 1 / 8;
+      case null:
+        return null;
     }
   }