diff --git a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
index a6c2fa2c7..1c2213f49 100644
--- a/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
@@ -85,13 +85,15 @@ public class PGPainlessCryptoHandler @Inject constructor() :
     .mapError { error ->
       when (error) {
         is MissingDecryptionMethodException -> {
-          if (key == null) // wrong passphrase provided for symmetric decryption
-           IncorrectPassphraseException(error.message, error.cause)
+          if (key == null) IncorrectPassphraseException(error.message, error.cause)
           else NoDecryptionKeyAvailableException(error.message, error.cause)
         }
         is WrongPassphraseException -> IncorrectPassphraseException(error.message, error.cause)
         is CryptoHandlerException -> error
-        else -> UnknownError(error.message, error)
+        else -> {
+          if (key == null) IncorrectPassphraseException(error.message, error)
+          else UnknownError(error.message, error)
+        }
       }
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a5563808..964198118 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,14 +18,14 @@ android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.5"
 androidx-activity = { module = "androidx.activity:activity", version.ref = "androidxActivity" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
 androidx-annotation = "androidx.annotation:annotation:1.10.0"
-androidx-appcompat = "androidx.appcompat:appcompat:1.7.1"
+androidx-appcompat = "androidx.appcompat:appcompat:1.8.0"
 androidx-autofill = "androidx.autofill:autofill:1.3.0"
 androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.2"
 androidx-core-ktx = "androidx.core:core-ktx:1.19.0"
 androidx-credentials = "androidx.credentials:credentials:1.6.0"
 androidx-documentfile = "androidx.documentfile:documentfile:1.1.0"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.9"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.9.0"
 androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.11.2"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
 androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
@@ -46,7 +46,7 @@ build-r8 = "com.android.tools:r8:9.2.23"
 build-semver = "com.github.zafarkhaja:java-semver:0.10.2"
 build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:8.9.0"
 build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:1.1.1"
-compose-bom = "androidx.compose:compose-bom:2026.06.01"
+compose-bom = "androidx.compose:compose-bom:2026.08.00"
 compose-foundation-core = { module = "androidx.compose.foundation:foundation" }
 compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
 compose-material3 = { module = "androidx.compose.material3:material3" }