Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/desktop/admin-config.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: admin-config
title: Admin Configuration
sidebar_position: 12
sidebar_position: 13
---

# Admin Configuration
Expand Down
2 changes: 1 addition & 1 deletion docs/desktop/common-errors.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: common-errors
title: Common Errors
sidebar_position: 15
sidebar_position: 16
---

# Common Errors
Expand Down
1 change: 1 addition & 0 deletions docs/desktop/encrypted-file-names.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ File name and directory structure encryption **cannot** be disabled.
Cryptomator protects your files by not only encrypting their content, but also their names and the overall directory structure of the vault. As a result, encrypted files and folders inside the vault storage location do not reveal the original names or layout (for an example see [below](#technical-example)).

This matters whenever you need to match a cleartext file in your unlocked vault with its encrypted counterpart in the vault storage location, for example when restoring an older version from a cloud provider or backup tool.
For step-by-step instructions, see [Restoring Files from a Backup](/docs/desktop/restoring-files-from-backup.mdx).

The app offers two features to reveal the mapping between the cleartext and the encrypted files:
* `Locate Encrypted File`: You have the cleartext file in the unlocked vault and want to find its encrypted counterpart in the vault storage location.
Expand Down
2 changes: 1 addition & 1 deletion docs/desktop/error-handling.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: error-handling
title: Error Handling
sidebar_position: 10
sidebar_position: 11
---

# Error Handling
Expand Down
2 changes: 1 addition & 1 deletion docs/desktop/network.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: network
title: Network Settings
sidebar_position: 13
sidebar_position: 14
---

# Network Settings
Expand Down
50 changes: 50 additions & 0 deletions docs/desktop/restoring-files-from-backup.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
id: restoring-files-from-backup
title: Restoring Files from a Backup
sidebar_position: 8
---

# Restoring Files from a Backup

Cryptomator encrypts not only file names but also the directory structure of your vault (see [Encrypted File Names](/docs/desktop/encrypted-file-names.mdx)).
In a backup of the vault storage location, you therefore can't tell which encrypted file belongs to which cleartext file, especially if it sits deep in a subdirectory.

There are two ways to restore a file or folder:

1. [Open the backup as a second vault](#open-backup-as-vault) - Recommended. Works at any nesting depth and also for files and folders that have already been deleted from the vault.
2. [Restore a single encrypted file](#restore-single-encrypted-file) - Use this if the file still exists in the vault with the same name and in the same folder as at the time of the backup, you only need an older version of it, and your backup tool can restore individual files.

Both methods require Cryptomator for Windows, macOS, or Linux.

## Open the Backup as a Second Vault {/* #open-backup-as-vault */}

1. Restore the **complete** vault folder from the backup to a separate location. It must contain the `d` folder and the `vault.cryptomator` and/or `masterkey.cryptomator` file.
Do not restore it inside the existing vault folder or inside a cloud-synced folder.
2. In Cryptomator, click the plus `+` button, choose [`Open Existing Vault…`](/docs/desktop/adding-vaults.mdx#open-an-existing-vault), and select the `vault.cryptomator` file of the restored copy. If only a `masterkey.cryptomator` file exists, select that instead.
The copy appears as an additional vault next to your original one.
3. Unlock the copy.
For a password-based vault, use the password that was valid at the time of the backup.
For a [Cryptomator Hub](/docs/hub/introduction.mdx) vault, [unlock it through Hub](/docs/hub/user-guide/access-vault.mdx#unlocking-a-vault) as usual.
Unlock your original vault as well.
4. In the unlocked copy, navigate to the file or folder you want to restore and copy it into your original vault.
5. Lock the copy and [remove it from the vault list](/docs/desktop/vault-management.mdx#remove-vaults) by right-clicking it and choosing `Remove…`.
This only removes the list entry and doesn't delete any encrypted files.
You can then delete the restored vault folder manually.

## Restore a Single Encrypted File {/* #restore-single-encrypted-file */}

This method only works if the file still exists in the vault with the same name and in the same folder as at the time of the backup.
If the file was renamed or moved to a different folder since the backup, its encrypted path has changed, so [open the backup as a second vault](#open-backup-as-vault) instead.

1. Unlock the vault and use [`Locate Encrypted File`](/docs/desktop/encrypted-file-names.mdx#locate-encrypted-file) on the file you want to restore.
Note the path of the encrypted file shown in the file manager.
2. Lock the vault.
3. With your backup tool, restore exactly that encrypted file to exactly the same path, overwriting the current one.
If the file ends up anywhere else, the vault won't recognize it, because its name is encrypted using the ID of its parent directory.
4. Unlock the vault again.

:::note
If you use `Locate Encrypted File` on a folder, the file manager shows the folder's content directory under `d/`.
It only contains the files directly inside that folder.
Subfolders are stored as links (`dir.c9r`) to other directories under `d/`, so to restore a folder with subfolders, [open the backup as a second vault](#open-backup-as-vault).
:::
2 changes: 1 addition & 1 deletion docs/desktop/sync-conflicts.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: sync-conflicts
title: Synchronization Conflicts
sidebar_position: 11
sidebar_position: 12
---

# Synchronization Conflicts
Expand Down
2 changes: 1 addition & 1 deletion docs/desktop/troubleshooting.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: troubleshooting
title: Troubleshooting
sidebar_position: 14
sidebar_position: 15
---

# Troubleshooting
Expand Down
2 changes: 1 addition & 1 deletion docs/desktop/vault-events.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: vault-events
title: Events and Event View
sidebar_position: 9
sidebar_position: 10
---

# Events and Event View
Expand Down
2 changes: 1 addition & 1 deletion docs/desktop/volume-type.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: volume-type
title: Volume Types
sidebar_position: 8
sidebar_position: 9
---

# Volume Types
Expand Down
Loading