From cdf98a7190f5ed198d9a91bcee137cac5561b103 Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Thu, 11 May 2023 00:02:05 +0200
Subject: [PATCH] Handle cryfs inaccessible base dir

---
 .../main/java/sushi/hardcore/droidfs/filesystems/CryfsVolume.kt  | 1 +
 app/src/main/res/values/strings.xml                              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/sushi/hardcore/droidfs/filesystems/CryfsVolume.kt b/app/src/main/java/sushi/hardcore/droidfs/filesystems/CryfsVolume.kt
index e9dfa98..e7c0346 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/filesystems/CryfsVolume.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/filesystems/CryfsVolume.kt
@@ -69,6 +69,7 @@ class CryfsVolume(private val fusePtr: Long): EncryptedVolume() {
                 result.errorStringId = when (errorCode.value) {
                     // Values from src/cryfs/impl/ErrorCodes.h
                     11 -> R.string.wrong_password
+                    16 -> R.string.inaccessible_base_dir
                     19 -> R.string.config_load_error
                     20 -> R.string.filesystem_id_changed
                     else -> 0
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 12d9f79..f49f63c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -261,5 +261,6 @@
     <string name="config_load_error">The configuration file cannot be loaded. Make sure the volume is accessible.</string>
     <string name="wrong_password">The configuration file cannot be decrypted. Please check your password.</string>
     <string name="filesystem_id_changed">The filesystem id in the config file is different to the last time we opened this volume. This could mean an attacker replaced the filesystem with a different one.</string>
+    <string name="inaccessible_base_dir">The volume doesn\'t exist or is inaccessible.</string>
     <string name="task_failed">The task failed: %s</string>
 </resources>