PM-23136: Android 10 crash hotfix (#5447)

app/src/main/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerImpl.kt

@@ -182,6 +182,7 @@ class VaultLockManagerImpl(
                             privateKey = privateKey,
                             method = initUserCryptoMethod,
                             userId = userId,
+                            signingKey = null,
                         ),
                     )
                     .flatMap { result ->

app/src/main/res/values-v30/values.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Always -->
+    <integer name="displayCutoutMode">3</integer>
+</resources>

app/src/main/res/values/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">@integer/displayCutoutMode</item>
         <item name="android:backgroundDimAmount">@dimen/dialogDimBackgroundAmount</item>
     </style>
 

app/src/main/res/values/values.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="dialogDimBackgroundAmount" format="float">0.55</dimen>
+    <!-- default -->
+    <integer name="displayCutoutMode">0</integer>
 </resources>

app/src/test/kotlin/com/x8bit/bitwarden/data/vault/manager/VaultLockManagerTest.kt

@@ -748,6 +748,7 @@ class VaultLockManagerTest {
                     method = InitUserCryptoMethod.DecryptedKey(
                         decryptedUserKey = userAutoUnlockKey,
                     ),
+                    signingKey = null,
                 ),
             )
         } returns InitializeCryptoResult.Success.asSuccess()
@@ -772,6 +773,7 @@ class VaultLockManagerTest {
                     method = InitUserCryptoMethod.DecryptedKey(
                         decryptedUserKey = userAutoUnlockKey,
                     ),
+                    signingKey = null,
                 ),
             )
             trustedDeviceManager.trustThisDeviceIfNecessary(userId = USER_ID)
@@ -904,6 +906,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns InitializeCryptoResult.Success.asSuccess()
@@ -969,6 +972,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
                 vaultSdkSource.initializeOrganizationCrypto(
@@ -1002,6 +1006,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns InitializeCryptoResult.Success.asSuccess()
@@ -1078,6 +1083,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
                 vaultSdkSource.initializeOrganizationCrypto(
@@ -1112,6 +1118,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns InitializeCryptoResult.AuthenticationError(error = error).asSuccess()
@@ -1158,6 +1165,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             }
@@ -1185,6 +1193,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns InitializeCryptoResult.Success.asSuccess()
@@ -1238,6 +1247,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             }
@@ -1272,6 +1282,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns error.asFailure()
@@ -1317,6 +1328,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             }
@@ -1344,6 +1356,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns InitializeCryptoResult.Success.asSuccess()
@@ -1396,6 +1409,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             }
@@ -1429,6 +1443,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             } returns InitializeCryptoResult.Success.asSuccess()
@@ -1488,6 +1503,7 @@ class VaultLockManagerTest {
                             password = masterPassword,
                             userKey = userKey,
                         ),
+                        signingKey = null,
                     ),
                 )
             }
@@ -1613,6 +1629,7 @@ class VaultLockManagerTest {
                         password = masterPassword,
                         userKey = userKey,
                     ),
+                    signingKey = null,
                 ),
             )
         } coAnswers {
@@ -1659,6 +1676,7 @@ class VaultLockManagerTest {
                         password = masterPassword,
                         userKey = userKey,
                     ),
+                    signingKey = null,
                 ),
             )
         } returns InitializeCryptoResult.Success.asSuccess()
@@ -1694,6 +1712,7 @@ class VaultLockManagerTest {
                         password = masterPassword,
                         userKey = userKey,
                     ),
+                    signingKey = null,
                 ),
             )
         }

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ androidxSplash = "1.1.0-rc01"
 androidXAppCompat = "1.7.0"
 androdixAutofill = "1.1.0"
 androidxWork = "2.10.1"
-bitwardenSdk = "1.0.0-20250602.132903-199"
+bitwardenSdk = "1.0.0-20250623.141835-223"
 crashlytics = "3.0.3"
 detekt = "1.23.8"
 firebaseBom = "33.14.0"

network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt

@@ -142,7 +142,7 @@ internal class BitwardenServiceClientImpl(
     }
 
     override val eventService: EventService by lazy {
-        EventServiceImpl(eventApi = retrofits.authenticatedApiRetrofit.create())
+        EventServiceImpl(eventApi = retrofits.authenticatedEventsRetrofit.create())
     }
 
     override val folderService: FolderService by lazy {