From 79c1e2d21c7d34b4b12267789fcfe40589df7a78 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 18 Jun 2024 20:08:54 +0200
Subject: [PATCH] fix: #1848 #1850

---
 CHANGELOG                                                | 3 +++
 app/build.gradle                                         | 4 ++--
 app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt | 7 ++++---
 fastlane/metadata/android/en-US/changelogs/131.txt       | 1 +
 fastlane/metadata/android/fr-FR/changelogs/131.txt       | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/131.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/131.txt

diff --git a/CHANGELOG b/CHANGELOG
index 7bea9d0b6..cb8629844 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+KeePassDX(4.0.8)
+ * Fix graphical bug that prevented databases from being opened on some versions of Android #1848 #1850
+
 KeePassDX(4.0.7)
  * Prevent 0 Byte file with cache during a save exception #1620 #1594 #1680
  * Fix inline suggestions in keyboard #1840
diff --git a/app/build.gradle b/app/build.gradle
index 55b217b8f..fe431a2c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 33
-        versionCode = 130
-        versionName = "4.0.7"
+        versionCode = 131
+        versionName = "4.0.8"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
diff --git a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
index 456fd0380..90e9ff5b2 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
@@ -306,10 +306,11 @@ fun Activity.setTransparentNavigationBar(applyToStatusBar: Boolean = false, appl
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
         && resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
         WindowCompat.setDecorFitsSystemWindows(window, false)
-        this.window.navigationBarColor = ContextCompat.getColor(this, R.color.surface_selector)
+        window.navigationBarColor = ContextCompat.getColor(this, R.color.surface_selector)
         if (applyToStatusBar) {
-            this.window.statusBarColor = obtainStyledAttributes(intArrayOf(R.attr.colorSurface)).use {
-                it.getColor(0, Color.GRAY)
+            obtainStyledAttributes(intArrayOf(R.attr.colorSurface)).apply {
+                window.statusBarColor = getColor(0, Color.GRAY)
+                recycle()
             }
         }
         applyWindowInsets.invoke()
diff --git a/fastlane/metadata/android/en-US/changelogs/131.txt b/fastlane/metadata/android/en-US/changelogs/131.txt
new file mode 100644
index 000000000..0551d2a7f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/131.txt
@@ -0,0 +1 @@
+ * Fix graphical bug that prevented databases from being opened on some versions of Android #1848 #1850
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/131.txt b/fastlane/metadata/android/fr-FR/changelogs/131.txt
new file mode 100644
index 000000000..3046a4591
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/131.txt
@@ -0,0 +1 @@
+ * Correction d'un bug graphique qui empêchait l'ouverture des bases de données sur certaines versions d'Android #1848 #1850
\ No newline at end of file