Skip to content

Commit 5b2d9b2

Browse files
tobihagemanntobihagemann
committed
Merge branch 'develop'
2 parents 63534c5 + b03aec3 commit 5b2d9b2

File tree

10 files changed

+700
-138
lines changed

10 files changed

+700
-138
lines changed

‎docs/android/access-vault.md

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ This section shows you how to work with a vault like view its content, move file
1212

1313
If you want to access the data inside a vault, you have to unlock it by selecting it.
1414

15-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
15+
<MobileGrid>
1616
<Image src="/img/android/unlock-vault-0-select.png" alt="How to unlock a vault with Android" width="810" height="1665" />
17-
</Grid>
17+
</MobileGrid>
1818

1919
In the next step, you have to unlock the vault using the password. If the device supports fingerprint authentication and you've activated it in the settings for this vault, you will be prompted to unlock using fingerprint. How to setup fingerprint authentication will be documented in a separate chapter.
2020

21-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
21+
<MobileGrid>
2222
<Image src="/img/android/unlock-vault-1-using-password.png" alt="How to unlock a vault with Android" width="1080" height="2220" />
2323
<Image src="/img/android/unlock-vault-2-using-fingerprint.png" alt="How to unlock a vault with Android" width="1080" height="2160" />
24-
</Grid>
24+
</MobileGrid>
2525

2626
After providing the credentials, the vault gets unlocked and opened.
2727

28-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
28+
<MobileGrid>
2929
<Image src="/img/android/unlock-vault-3-loading.png" alt="How to unlock a vault with Android" width="1080" height="2220" />
3030
<Image src="/img/android/unlock-vault-4-unlocked.png" alt="How to unlock a vault with Android" width="1080" height="2220" />
31-
</Grid>
31+
</MobileGrid>
3232

3333
You're now able to edit the content of the vault.
3434

@@ -40,18 +40,18 @@ To lock an unlocked vault, there are several ways to do this:
4040
* use the lock button in the notification ②
4141
* use the lock button in the vault actions ③ and ④
4242

43-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
43+
<MobileGrid>
4444
<Image src="/img/android/lock-vault-0-lock.png" alt="How to lock a vault with Android" width="810" height="1665" />
4545
<Image src="/img/android/lock-vault-1-notification.png" alt="How to lock a vault with Android" width="810" height="1665" />
4646
<Image src="/img/android/lock-vault-2-lock-start.png" alt="How to lock a vault with Android" width="810" height="1665" />
4747
<Image src="/img/android/lock-vault-3-select-lock.png" alt="How to lock a vault with Android" width="810" height="1665" />
48-
</Grid>
48+
</MobileGrid>
4949

5050
All of the possibilities will result in the locked vault.
5151

52-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
52+
<MobileGrid>
5353
<Image src="/img/android/lock-vault-4-finish.png" alt="How to lock a vault with Android" width="1080" height="2220" />
54-
</Grid>
54+
</MobileGrid>
5555

5656
:::note
5757
The auto-lock timeout specified in the settings will lock the vault if Cryptomator is in background. Furthermore if not changed in settings, the vault gets locked if the screen turns off.
@@ -63,71 +63,71 @@ Start the view and edit process by clicking on a file.
6363
Finish the editing or viewing using the back button of the device until you're back in Cryptomator.
6464
If the content has changed, the upload process starts.
6565

66-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
66+
<MobileGrid>
6767
<Image src="/img/android/edit-file.gif" alt="How to edit a file with Android" width="540" height="1110" />
68-
</Grid>
68+
</MobileGrid>
6969

7070
## Rename File or Folder {#rename-file-or-folder}
7171

7272
To change the name of a specific file or folder in Cryptomator, you select the `V` ① next to the file or folder and choose *Rename* ②.
7373

74-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
74+
<MobileGrid>
7575
<Image src="/img/android/rename-vault-0-start.png" alt="How to rename a vault with Android" width="810" height="1665" />
7676
<Image src="/img/android/rename-vault-1-select-rename.png" alt="How to rename a vault with Android" width="810" height="1665" />
77-
</Grid>
77+
</MobileGrid>
7878

7979
Choose a new name and confirm using the `RENAME` button.
8080

81-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
81+
<MobileGrid>
8282
<Image src="/img/android/rename-vault-3-renaming.png" alt="How to rename a vault with Android" width="1080" height="2220" />
8383
<Image src="/img/android/rename-vault-4-finish.png" alt="How to rename a vault with Android" width="1080" height="2220" />
84-
</Grid>
84+
</MobileGrid>
8585

8686
## Move File or Folder {#move-file-or-folder}
8787

8888
To move a file or a folder into another folder, you select the `V` next to the file or folder ① and choose *Move* ②.
8989

90-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
90+
<MobileGrid>
9191
<Image src="/img/android/move-file-0-start.png" alt="How to move a file or folder with Android" width="810" height="1665" />
9292
<Image src="/img/android/move-file-1-select-move.png" alt="How to move a file or folder with Android" width="810" height="1665" />
93-
</Grid>
93+
</MobileGrid>
9494

9595
Choose a new location by selecting a folder or by pressing the back button of your phone to navigate to the parent folder.
9696

97-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
97+
<MobileGrid>
9898
<Image src="/img/android/move-file-2-move-root.png" alt="How to move a file or folder with Android" width="1080" height="2220" />
9999
<Image src="/img/android/move-file-3-move-target.png" alt="How to move a file or folder with Android" width="1080" height="2220" />
100-
</Grid>
100+
</MobileGrid>
101101

102102
Confirm using the `MOVE` button.
103103

104-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
104+
<MobileGrid>
105105
<Image src="/img/android/move-file-3-moving.png" alt="How to move a file or folder with Android" width="1080" height="2220" />
106106
<Image src="/img/android/move-file-4-finish.png" alt="How to move a file or folder with Android" width="1080" height="2220" />
107-
</Grid>
107+
</MobileGrid>
108108

109109
While moving, you can use the ③ button to create a new folder in the current folder.
110110

111-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
111+
<MobileGrid>
112112
<Image src="/img/android/move-file-5-move-folder-hint.png" alt="How to move a file or folder with Android" width="810" height="1665" />
113-
</Grid>
113+
</MobileGrid>
114114

115115
## Delete File or Folder {#delete-file-or-folder}
116116

117117
To delete a specific file or folder in Cryptomator, you select the `V` next to the file or folder ① and choose *Delete* ②.
118118

119-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
119+
<MobileGrid>
120120
<Image src="/img/android/delete-file-0-start.png" alt="How delete a file or folder with Android" width="810" height="1665" />
121121
<Image src="/img/android/delete-file-1-select-delete.png" alt="How delete a file or folder with Android" width="810" height="1665" />
122-
</Grid>
122+
</MobileGrid>
123123

124124
Confirm the deletion process using the `DELETE` button.
125125

126-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
126+
<MobileGrid>
127127
<Image src="/img/android/delete-file-2-confirmation.png" alt="How to delete a file or folder with Android" width="1080" height="2220" />
128128
<Image src="/img/android/delete-file-3-deleting.png" alt="How to delete a file or folder with Android" width="1080" height="2220" />
129129
<Image src="/img/android/delete-file-4-finish.png" alt="How to delete a file or folder with Android" width="1080" height="2220" />
130-
</Grid>
130+
</MobileGrid>
131131

132132
:::note
133133
By deleting a folder, all subfolders and files inside are deleted recursively.
@@ -137,33 +137,33 @@ By deleting a folder, all subfolders and files inside are deleted recursively.
137137

138138
To export a specific file or folder in Cryptomator, you select the `V` next to the file or folder ① and choose *Export* ②.
139139

140-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
140+
<MobileGrid>
141141
<Image src="/img/android/export-file-0-start.png" alt="How export a file or folder with Android" width="810" height="1665" />
142142
<Image src="/img/android/export-file-1-select-export.png" alt="How export a file or folder with Android" width="810" height="1665" />
143-
</Grid>
143+
</MobileGrid>
144144

145145
Choose the target location where the file or folder should be exported to.
146146

147-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
147+
<MobileGrid>
148148
<Image src="/img/android/export-file-2-choose-location.png" alt="How to export a file or folder with Android" width="1080" height="2220" />
149149
<Image src="/img/android/export-file-3-exporting.png" alt="How to export a file or folder with Android" width="1080" height="2220" />
150150
<Image src="/img/android/export-file-4-finish.png" alt="How to export a file or folder with Android" width="1080" height="2220" />
151-
</Grid>
151+
</MobileGrid>
152152

153153
## Share File with Other App {#share-file-with-other-app}
154154

155155
To share a specific file or folder in Cryptomator with another app, you select the `V` next to the file or folder ① and choose Share ②.
156156

157-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
157+
<MobileGrid>
158158
<Image src="/img/android/share-file-0-start.png" alt="How share a file or folder with Android" width="810" height="1665" />
159159
<Image src="/img/android/share-file-1-select-share.png" alt="How share a file or folder with Android" width="810" height="1665" />
160-
</Grid>
160+
</MobileGrid>
161161

162162
Choose the target app in which you will use the file or folder.
163163

164-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
164+
<MobileGrid>
165165
<Image src="/img/android/share-file-2-select-app.png" alt="How to share a file or folder with Android" width="1080" height="2220" />
166-
</Grid>
166+
</MobileGrid>
167167

168168
:::tip
169169
By sharing a file or folder from Cryptomator with Cryptomator, you can copy content from one vault to another one.
@@ -177,43 +177,43 @@ We use as example the Files app from Android.
177177
You select the file(s) to share by long clicking on it ①.
178178
Press the share button ② to choose to share these file(s) and select *Cryptomator* ③.
179179

180-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
180+
<MobileGrid>
181181
<Image src="/img/android/share-with-cm-0-start.png" alt="How share a file or folder with Android" width="810" height="1665" />
182182
<Image src="/img/android/share-with-cm-1-choose-cm.png" alt="How share a file or folder with Android" width="810" height="1665" />
183-
</Grid>
183+
</MobileGrid>
184184

185185
Choose the vault ⑤ and optionally specify the target folder in the vault ④ (default is the root).
186186

187-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
187+
<MobileGrid>
188188
<Image src="/img/android/share-with-cm-2-select-vault.png" alt="How to share a file or folder with Android" width="810" height="1665" />
189-
</Grid>
189+
</MobileGrid>
190190

191191
Then the encryption and upload starts.
192192

193-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
193+
<MobileGrid>
194194
<Image src="/img/android/share-with-cm-3-uploading.png" alt="How to share a file or folder with Android" width="1080" height="2220" />
195195
<Image src="/img/android/share-with-cm-4-finish.png" alt="How to share a file or folder with Android" width="1080" height="2220" />
196-
</Grid>
196+
</MobileGrid>
197197

198198
## Search in Folder {#search-in-folder}
199199

200200
Search for files or folders within the same folder using the magnifier ①.
201201

202-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
202+
<MobileGrid>
203203
<Image src="/img/android/search-0-start.png" alt="How to search in a vault with Android" width="810" height="1665" />
204-
</Grid>
204+
</MobileGrid>
205205

206206
Now you can enter the pattern after which you want to search in this folder.
207207

208-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
208+
<MobileGrid>
209209
<Image src="/img/android/search-1-searched.png" alt="How to search in a vault with Android" width="1080" height="2220" />
210-
</Grid>
210+
</MobileGrid>
211211

212212
Using the `X` ② you can clear the pattern and after pressing it again, the filter mode is finished.
213213

214-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
214+
<MobileGrid>
215215
<Image src="/img/android/search-2-finish.png" alt="How to search in a vault with Android" width="810" height="1665" />
216-
</Grid>
216+
</MobileGrid>
217217

218218
In the settings there are two options that influence the behavior of the search:
219219

@@ -224,14 +224,14 @@ For more information, see the Settings chapter.
224224

225225
## Sort Folder by… {#sort-folder-by}
226226

227-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
227+
<MobileGrid>
228228
<Image src="/img/android/sort.gif" alt="How to sort the content of a folder with Android" width="540" height="1110" />
229-
</Grid>
229+
</MobileGrid>
230230

231231
## Fast Scroll {#fast-scroll}
232232

233-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
233+
<MobileGrid>
234234
<Image src="/img/android/fast-scroll.gif" alt="How to scroll fast through the content of a folder with Android" width="540" height="1110" />
235-
</Grid>
235+
</MobileGrid>
236236

237237
If the folder contents are sorted by file size, the preview will show the file sizes accordingly. The same applies to the modification date.

‎docs/android/cloud-management.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ sidebar_position: 2
66

77
# Cloud Management
88

9-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
9+
<MobileGrid>
1010
<Image src="/img/android/setting-cloud-services.png" alt="How to handle cloud services with Android" width="1080" height="2220" />
11-
</Grid>
11+
</MobileGrid>
1212

1313
In "Cloud Services", you can create or edit the connection between the Cryptomator app and your storage provider accounts.
1414

@@ -24,33 +24,33 @@ Please keep in mind that Cryptomator then cannot connect to your vault anymore.
2424

2525
## Login Dropbox {#login-dropbox}
2626

27-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
27+
<MobileGrid>
2828
<Image src="/img/android/add-dropbox-login-provider-0.png" alt="How to handle cloud services with Android" width="1080" height="1920" />
2929
<Image src="/img/android/add-dropbox-login-provider-1.png" alt="How to handle cloud services with Android" width="1080" height="1920" />
30-
</Grid>
30+
</MobileGrid>
3131

3232
## Login Google Drive {#login-google-drive}
3333

34-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
34+
<MobileGrid>
3535
<Image src="/img/android/add-googledrive-login-provider.png" alt="How to handle cloud services with Android" width="1080" height="2220" />
36-
</Grid>
36+
</MobileGrid>
3737

3838
## Login OneDrive {#login-onedrive}
3939

40-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
40+
<MobileGrid>
4141
<Image src="/img/android/add-onedrive-login-provider-0.png" alt="How to handle cloud services with Android" width="1080" height="2220" />
4242
<Image src="/img/android/add-onedrive-login-provider-1.png" alt="How to handle cloud services with Android" width="1080" height="2220" />
43-
</Grid>
43+
</MobileGrid>
4444

4545
## Login WebDAV {#login-webdav}
4646

4747
Please see [Cloud Services With WebDAV Support](/docs/misc/supported-cloud-services.md#cloud-services-with-webdav-support) for a non-exhaustive list of Cloud Services and information about accessing them with WebDAV.
4848

49-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
49+
<MobileGrid>
5050
<Image src="/img/android/add-webdav-login-provider-0.png" alt="How to handle cloud services with Android" width="810" height="1665" />
5151
<Image src="/img/android/add-webdav-login-provider-1.png" alt="How to handle cloud services with Android" width="1080" height="2220" />
5252
<Image src="/img/android/add-webdav-login-provider-2.png" alt="How to handle cloud services with Android" width="1080" height="2220" />
53-
</Grid>
53+
</MobileGrid>
5454

5555
:::note
5656
While creating the WebDAV connection, please make sure to add the root of the accessible storage and don't navigate directly into the vault.
@@ -62,21 +62,21 @@ Generate a key that has permissions "Allow List All Bucket Names". (AWS root use
6262

6363
"endpoint" refers to how the S3 API for your bucket can be reached. In the case of [official S3](https://docs.aws.amazon.com/general/latest/gr/s3.html), it would be `s3.<region>.amazonaws.com`, for e.g. [Backblaze B2](https://www.backblaze.com/apidocs/introduction-to-the-s3-compatible-api) `s3.<region>.backblazeb2.com`.
6464

65-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
65+
<MobileGrid>
6666
<Image src="/img/android/add-s3-login-provider.png" alt="Android S3 connection form" width="1080" height="2520" />
67-
</Grid>
67+
</MobileGrid>
6868

6969
## Login Local Storage {#login-local-storage}
7070

7171
The following pictures describes how to setup a location to access vaults stored on the internal storage of the device (the same applies for vaults located e.g. on a SD card):
7272

73-
<Grid columns={3} columnsSmall={2} columnsLarge={4}>
73+
<MobileGrid>
7474
<Image src="/img/android/add-localstorage-login-provider-0.png" alt="How to handle cloud services with Android" width="810" height="1620" />
7575
<Image src="/img/android/add-localstorage-login-provider-1.png" alt="How to handle cloud services with Android" width="810" height="1620" />
7676
<Image src="/img/android/add-localstorage-login-provider-2.png" alt="How to handle cloud services with Android" width="810" height="1620" />
7777
<Image src="/img/android/add-localstorage-login-provider-3.png" alt="How to handle cloud services with Android" width="810" height="1620" />
7878
<Image src="/img/android/add-localstorage-login-provider-4.png" alt="How to handle cloud services with Android" width="810" height="1620" />
79-
</Grid>
79+
</MobileGrid>
8080

8181
After creating the location, you can access it by clicking on the name of the location to add a vault or create a new vault.
8282

0 commit comments

Comments
 (0)