From 92c6efa6e650333cb8a301d0e9eb0775963745dd Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:53:15 +0200 Subject: [PATCH 1/9] Added "Supported Cloud Services" page and moved content Added the page, including overview/intro text and content for "Natively supported Cloud Services" section Added the page to "index.rst" Moved content from "Android/Setup" to "Supported Cloud Services" page Refactored linebreaks and links on "Android/Setup" page Overhauled text on "Android/Setup" page --- .../_static/csv/natively-supported-clouds.csv | 11 +++ source/android/setup.rst | 81 +++++++++++-------- source/index.rst | 1 + source/misc/supported-cloud-services.rst | 62 ++++++++++++++ 4 files changed, 121 insertions(+), 34 deletions(-) create mode 100644 source/_static/csv/natively-supported-clouds.csv create mode 100644 source/misc/supported-cloud-services.rst diff --git a/source/_static/csv/natively-supported-clouds.csv b/source/_static/csv/natively-supported-clouds.csv new file mode 100644 index 0000000..5f04a48 --- /dev/null +++ b/source/_static/csv/natively-supported-clouds.csv @@ -0,0 +1,11 @@ +"Cloud Service","Android [#playstore-recommendation]_","iOS" +"Dropbox","✅ [#except-f-droid-main]_","✅" +"Google Drive","✅ [#except-f-droid-main]_ [#except-f-droid-cryptomator]_","✅" +"OneDrive","✅ [#except-f-droid-main]_","✅" +"pCloud","✅ [#except-f-droid-main]_","✅" +"S3","✅","✅" +"Box.com","❌","✅" +"iCloud","❌","✅" +"Local device storage","✅","✅" +"Spaces provided by other apps [#note-app-spaces]_","✅","✅" +"WebDAV [#note-webdav]_","✅","✅" \ No newline at end of file diff --git a/source/android/setup.rst b/source/android/setup.rst index ecf134b..f00f0f9 100644 --- a/source/android/setup.rst +++ b/source/android/setup.rst @@ -1,80 +1,89 @@ -.. role:: raw-html(raw) - :format: html - Setup ===== You can get Cryptomator for Android on -* `Google Play `_ -* `APK Store `_ -* `Cryptomator F-Droid repository `_ -* `Main F-Droid repository `_ +* `Google Play Store`_ +* `APK Store`_ +* `Cryptomator F-Droid repository`_ +* `Main F-Droid repository`_ + +No matter which variant of the app you choose: The key functionality of Cryptomator stays the same. + +| The variants only differ in terms of the :ref:`supported Cloud Services,` the way they are downloaded and the way a license is acquired. + If you have access to the Google Play Store on your device, **we recommend using the Google Play Store variant of Cryptomator.** +| Otherwise, please keep reading. + +.. _android/setup/variant-differences: + +Differences between variants and how to choose +---------------------------------------------- -As for the functionality of Cryptomator, the application does not differ using Google Play or the APK Store as installation type. Google Drive is excluded from the F-Droid version because Google Drive needs proprietary dependencies which doesn’t fit to the spirit of F-Droid. +While all variants of the Cryptomator for Android app have the same key functionality, you should make sure to pick +the perfect variant for you: -The APK Store and F-Droid variant of Cryptomator was created to serve users who do not have Google PlayStore installed on their Android device. -If you have a Google PlayStore on your device, we recommend using the PlayStore version of Cryptomator. +Most users will want to use the Google Play Store or the APK Store as installation type. Both variants have access to all +supported Cloud Services and allow for maximum flexibility. While the Google Play Store variant can be purchased and downloaded via its +Google Play Store page, the APK Store variant and the accompanying license must be obtained via our website. -.. csv-table:: Cryptomator for Android variants - :header: "", ":ref:`Google Play `", ":ref:`APK Store `", ":ref:`Cryptomator F-Droid repo `", ":ref:`Main F-Droid repo `" +| The Cryptomator F-Droid repo variant and Main F-Droid repo variant both **don't** support Google Drive as Cloud Service because + Google Drive requires proprietary dependencies which doesn’t fit the spirit of F-Droid. + Additionally the Main F-Droid repo variant **doesn't** support **any** Cloud Services that require an API key. +| Both can be downloaded from their corresponding F-Droid repository and require a license which can be obtained via + our website. +| The APK Store and F-Droid variants of Cryptomator were created to serve users who do not have the Google Play Store installed + on their Android device or do not want their purchases to go through Google. - "Dropbox", "✅", "✅", "✅", "❌¹" - "Google Drive", "✅", "✅", "❌²", "❌¹" - "OneDrive", "✅", "✅", "✅", "❌¹" - "pCloud", "✅", "✅", "✅", "❌¹" - "WebDAV", "✅", "✅", "✅", "✅" - "S3", "✅", "✅", "✅", "✅" - "Local Storage", "✅", "✅", "✅", "✅" +If you have access to the Google Play Store on your device, **we recommend using the Google Play Store variant of Cryptomator** +for the best user experience and maximum flexibility. -❌¹: Excluded because they require API keys. :raw-html:`
` -❌²: Excluded because they contains proprietary dependencies. +To learn more about the supported Cloud Services, please see :ref:`Supported Cloud Services.` .. _android/setup/google-playstore: -Google PlayStore +Google Play Store ------------------ -If you have installed Cryptomator via the Google PlayStore, you will receive updates as usual via the Google PlayStore. +If you have installed Cryptomator via the Google Play Store, you will receive updates as usual via the Google Play Store. -After buying the app using Google PlayStore, it can be used with any number of devices that you have linked to the google account from your purchase. Furthermore it supports the "Google Play Family Library" function which means that the app can be used by up to 5 people in a family without having to buy it again. The conditions and how to create a “Google Play Family” can be found here: https://support.google.com/googleplay/answer/7007852?hl=en +After buying the app using the Google Play Store, it can be used with any number of devices that you have linked to the google account from your purchase. Furthermore it supports the "Google Play Family Library" function which means that the app can be used by up to 5 people in a family without having to buy it again. The conditions and how to create a “Google Play Family” can be found here: https://support.google.com/googleplay/answer/7007852?hl=en -Sometimes the Google PlayStore has problems to recognize that the app was already bought and asks you to buy again the app, see this topic to recover from this problem: `On how many devices can the app be installed using Google Play Store? `_ +Sometimes the Google Play Store has problems to recognize that the app was already bought and asks you to buy again the app, see this topic to recover from this problem: `On how many devices can the app be installed using Google Play Store? `_ .. _android/setup/apk-store: APK Store ------------ -The APK store version can be installed from our website `https://cryptomator.org/android/ `_. Please verify the `SHA256 Signature` after downloading the APK before installing. The download is a so-called `APK` (Android application package), which is an installation archive. Install the app by simply clicking on the APK. +The APK store variant can be installed from our website `https://cryptomator.org/android/ `_. Please verify the `SHA256 Signature` after downloading the APK before installing. The download is a so-called `APK` (Android application package), which is an installation archive. Install the app by simply clicking on the APK. It is possible that the app in which you clicked on the APK is asking for "Install from Unknown Sources" permission, this is normal and must be activated for a short time (it is recommended to remove the permission afterwards). -This version does include an automatic updater that periodically checks if there is a newer version of this app, and if so, it can be downloaded and installed directly from within the app. Using the :ref:`Update Check Interval ` in the Cryptomator settings, you can specify how often the update check is executed. +This variant does include an automatic updater that periodically checks if there is a newer version of this app, and if so, it can be downloaded and installed directly from within the app. Using the :ref:`Update Check Interval ` in the Cryptomator settings, you can specify how often the update check is executed. -As this version wasn't bought using Google's PlayStore you need to buy a license key from our website `https://cryptomator.org/android/ `_. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. +As this variant wasn't bought using Google's Google Play Store you need to buy a license key from our website `https://cryptomator.org/android/ `_. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. .. _android/setup/f-droid-repository: Cryptomator F-Droid repository -------------------------------- -The Cryptomator F-Droid repository version can be installed after adding our F-Droid repository to the F-Droid app by opening `this link `_ on the device or scanning the following QR-Code: +The Cryptomator F-Droid repository variant can be installed after adding our F-Droid repository to the F-Droid app by opening `this link `_ on the device or scanning the following QR-Code: .. image:: ../img/android/fdroid-qr-code.svg :alt: How to handle cloud services with Android :width: 128px -As well as using the APK Store variant because this app version wasn't bought using Google's PlayStore you need to buy a license key from our website `https://cryptomator.org/android/ `_. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. +As well as using the APK Store variant because this app variant wasn't bought using Google's Google Play Store you need to buy a license key from our website `https://cryptomator.org/android/ `_. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. .. _android/setup/f-droid-main-repository: Main F-Droid repository ------------------------ -The Main F-Droid repository version can be installed directly from the `Main F-Droid repository `_. Regarding the license key, the same applies as with the :ref:`Cryptomator F-Droid repository ` variant. +The Main F-Droid repository variant can be installed directly from the `Main F-Droid repository `_. Regarding the license key, the same applies as with the :ref:`Cryptomator F-Droid repository ` variant. -Unlike all other versions of Cryptomator for Android, this version has its own package name: ``org.cryptomator.lite``. It means that you cannot, intentionally or unintentionally, simply switch between this and the other versions. It requires to setup the app again. The reason we decided to do this is that other Cryptomator variants already exist in some popular F-Droid repositories, and if we hadn't decided to do this, there could have been an unwanted variant switch. +Unlike all other variants of Cryptomator for Android, this variant has its own package name: ``org.cryptomator.lite``. It means that you cannot, intentionally or unintentionally, simply switch between this and the other variants. It requires to setup the app again. The reason we decided to do this is that other Cryptomator variants already exist in some popular F-Droid repositories, and if we hadn't decided to do this, there could have been an unwanted variant switch. .. _android/setup/requirements: @@ -88,10 +97,14 @@ Requires Android 8.0 or later. Update Rollout --------------- -The timing of the update depends on your installation type: +The timing of the update depends on your installed variant: -* Google PlayStore: Updates are reviewed by Google, so it may take a few days before the update is available. +* Google Play Store: Updates are reviewed by Google, so it may take a few days before the update is available. * APK Store: Updates are available as they are released. * Cryptomator F-Droid Repo: Updates are available as they are released. * Main F-Droid Repo: Updates are available as soon as the F-Droid maintainers have built the application, which can take a few days. +.. _`Google Play Store`: https://play.google.com/store/apps/details?id=org.cryptomator&hl=en +.. _`APK Store`: https://cryptomator.org/android/ +.. _`Cryptomator F-Droid repository`: https://static.cryptomator.org/android/fdroid/repo?fingerprint=F7C3EC3B0D588D3CB52983E9EB1A7421C93D4339A286398E71D7B651E8D8ECDD +.. _`Main F-Droid repository`: https://f-droid.org/en/packages/org.cryptomator.lite \ No newline at end of file diff --git a/source/index.rst b/source/index.rst index 501bc47..053ee5f 100644 --- a/source/index.rst +++ b/source/index.rst @@ -90,4 +90,5 @@ If you are interested in the security of Cryptomator, have a look at our :ref:`s :caption: Misc misc/contribute.rst + misc/supported-cloud-services.rst misc/vault-format-history.rst diff --git a/source/misc/supported-cloud-services.rst b/source/misc/supported-cloud-services.rst new file mode 100644 index 0000000..93ec7a2 --- /dev/null +++ b/source/misc/supported-cloud-services.rst @@ -0,0 +1,62 @@ +.. _misc/supported-cloud-services: + +Supported Cloud Services +======================== + +A standard use case for Cryptomator is storing your encrypted vaults in a Cloud Service of your choice for +safe and private synchronization of your data. When using Cryptomator for Desktop, you will need to have your +Cloud Service's synchronization software installed on your computer to access cloud-based vaults. + +| In comparison, Cryptomator for Android and Cryptomator for iOS support access to vaults that are stored with a range + of Cloud Services directly from within the app. +| While the Cryptomator for Android and Cryptomator for iOS apps offer native support for a growing number of cloud + services, it can happen, especially with smaller ones, that your Cloud Service is not natively supported. +| In this case, however, most providers allow you to connect to your vaults via WebDAV instead. + +.. note:: + | Depending on how well it is supported by your provider, individual features may not work optimally + when using WebDAV. + | If possible, *we therefore recommend that you access your data using the native integration* of your Cloud Service + for an optimal user experience. + +The following sections will provide you with an overview +of :ref:`natively supported Cloud Services,` as well as +information about :ref:`selected Cloud Services with WebDAV support` +and a list of :ref:`incompatible Cloud Services.` + +.. _misc/supported-cloud-services/natively-supported-clouds: + +Natively supported Cloud Services (Recommended) +----------------------------------------------- + +The following Cloud Services are natively supported by Cryptomator for Android and/or Cryptomator for iOS. + +.. csv-table:: Natively supported Cloud Services + :header-rows: 1 + :file: ../_static/csv/natively-supported-clouds.csv + +.. [#playstore-recommendation] **We recommend using the Google Play Store variant of Cryptomator for Android users** + for the best experience. Please see :ref:`here ` for more information about + the different Cryptomator for Android variants and the reasoning behind those. +.. [#except-f-droid-main] Not supported by the :ref:`Main F-Droid repo variant ` + because this Cloud Service requires an API key. +.. [#except-f-droid-cryptomator] Not supported by the :ref:`Cryptomator F-Droid repo variant ` + because this Cloud Service requires proprietary dependencies. +.. [#note-app-spaces] Some Android and iOS apps integrate into the operating system's file manager with their own + storage spaces to allow seamless access to their files via so called "File Providers." Cryptomator generally supports + saving vaults in those spaces, but is dependent on those apps explicitly supporting access by other + apps like Cryptomator. This is not a limitation of Cryptomator and needs to be addressed by those apps. + For more technical information about this see `here `__ for Android + and `here `__ for iOS. +.. [#note-webdav] Please see :ref:`misc/supported-cloud-services/clouds-with-webdav-support` for a non-exhaustive list + of Cloud Services and information about accessing them with WebDAV. + +.. _misc/supported-cloud-services/clouds-with-webdav-support: + +Cloud Services with WebDAV support +---------------------------------- + +.. _misc/supported-cloud-services/incompatible-clouds: + +Incompatible Cloud Services +--------------------------- \ No newline at end of file From 3bb4ec04b5a818769af11393a6c28b2f6839ab71 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sat, 5 Oct 2024 02:02:18 +0200 Subject: [PATCH 2/9] Added "Cloud Services with WebDAV support" section The table and footnotes originate here: https://community.cryptomator.org/t/webdav-urls-of-common-cloud-storage-services/75 --- .../csv/clouds-with-webdav-support.csv | 26 +++++++++++++++++++ source/misc/supported-cloud-services.rst | 18 +++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 source/_static/csv/clouds-with-webdav-support.csv diff --git a/source/_static/csv/clouds-with-webdav-support.csv b/source/_static/csv/clouds-with-webdav-support.csv new file mode 100644 index 0000000..a8c83f9 --- /dev/null +++ b/source/_static/csv/clouds-with-webdav-support.csv @@ -0,0 +1,26 @@ +"Cloud Service","URL" +"1&1 Online-Speicher (DSL)","``https://sd2dav.1und1.de``" +"1&1 Online-Speicher (Webhosting)","``https://webdav.office.1und1.de``" +"blaucloud","``https://{username}.blaucloud.de/remote.php/webdav``" +"Disroot*","``https://cloud.disroot.org/remote.php/webdav/``" +"freenetcloud","``https://webmail.freenet.de/webdav``" +"GMX MediaCenter","``https://webdav.mc.gmx.net``" +"HiDrive IONOS*","``https://webdav.hidrive.ionos.com``" +"HiDrive Strato*","``https://webdav.hidrive.strato.com``" +"IceDrive*","``https://webdav.icedrive.io/``" +"kDrive*","``https://connect.drive.infomaniak.com``" +"Koofr*","``https://app.koofr.net/dav/Koofr``" +"MagentaCLOUD*","``https://magentacloud.de/remote.php/webdav``" +"Mail.Ru","``https://webdav.cloud.mail.ru``" +"Nextcloud*","``https://{host}/{path}/remote.php/dav/files/{username}`` or ``https://{host}/{path}/remote.php/webdav``" +"ownCloud*","``https://{host}/{path}/remote.php/webdav``" +"pCloud* (US)","``https://webdav.pcloud.com``" +"pCloud* (EU)","``https://ewebdav.pcloud.com``" +"Seafile (self-hosted)","``https://{host}/{path}/seafdav``" +"STACK","``https://{username}.stackstorage.com/remote.php/webdav``" +"SWITCHdrive","``https://drive.switch.ch/remote.php/dav/files/{username}``" +"Syncwerk (formerly Seafile.de)","``https://app.syncwerk.com/seafdav``" +"WEB.DE Online-Speicher","``https://webdav.smartdrive.web.de``" +"wölkli","``https://cloud.woelkli.com/remote.php/webdav``" +"Yandex.Disk*","``https://webdav.yandex.com``" +"Mailbox.org","``https://dav.mailbox.org/servlet/webdav.infostore/``" \ No newline at end of file diff --git a/source/misc/supported-cloud-services.rst b/source/misc/supported-cloud-services.rst index 93ec7a2..0a2d325 100644 --- a/source/misc/supported-cloud-services.rst +++ b/source/misc/supported-cloud-services.rst @@ -56,6 +56,24 @@ The following Cloud Services are natively supported by Cryptomator for Android a Cloud Services with WebDAV support ---------------------------------- +The following *non-exhaustive* table lays out information about Cloud Services that can be accessed using WebDAV +by both Cryptomator for Android and Cryptomator for iOS. + +.. csv-table:: Cloud Services with WebDAV support + :header-rows: 1 + :file: ../_static/csv/clouds-with-webdav-support.csv + +| \* Disroot: To login you must provide your disroot user_name (or your email if using with own domain) and password. If 2FA is enabled, generate app-specific-password +| \* IceDrive requires a paid plan and a separate access key as password. (see `here `_) +| \* kDrive disables WebDAV support for free users. +| \* Koofr needs a separate app password for WebDAV access. +| \* MagentaCLOUD needs a separate protocol password for WebDAV access. +| \* Nextcloud needs an app-specific password when 2FA is enabled. +| \* ownCloud needs an app-specific password when 2FA is enabled. +| \* pCloud disables WebDAV access when 2FA is enabled. Requires a paid plan. +| \* Yandex.Disk needs an app-specific password when 2FA is enabled. +| \* Strato and HiDrive using 2FA requires the OTP provided next to the password but it is only valid for 60 minutes then (see `here `_) + .. _misc/supported-cloud-services/incompatible-clouds: Incompatible Cloud Services From 5e4fefd0efbe71f934fac533782d83769fbe0861 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sat, 5 Oct 2024 02:15:34 +0200 Subject: [PATCH 3/9] Revised "Cloud Services with WebDAV support" section Replaced asterisks with actual footnotes Split footnotes for "HiDrive IONOS" and "HiDrive Strato" Reordered "Cloud Services with WebDAV support" table Reordered and cleaned up corresponding footnotes --- .../csv/clouds-with-webdav-support.csv | 26 +++++++++---------- source/misc/supported-cloud-services.rst | 21 ++++++++------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/source/_static/csv/clouds-with-webdav-support.csv b/source/_static/csv/clouds-with-webdav-support.csv index a8c83f9..bb50e39 100644 --- a/source/_static/csv/clouds-with-webdav-support.csv +++ b/source/_static/csv/clouds-with-webdav-support.csv @@ -2,25 +2,25 @@ "1&1 Online-Speicher (DSL)","``https://sd2dav.1und1.de``" "1&1 Online-Speicher (Webhosting)","``https://webdav.office.1und1.de``" "blaucloud","``https://{username}.blaucloud.de/remote.php/webdav``" -"Disroot*","``https://cloud.disroot.org/remote.php/webdav/``" +"Disroot [#note-disroot]_","``https://cloud.disroot.org/remote.php/webdav/``" "freenetcloud","``https://webmail.freenet.de/webdav``" "GMX MediaCenter","``https://webdav.mc.gmx.net``" -"HiDrive IONOS*","``https://webdav.hidrive.ionos.com``" -"HiDrive Strato*","``https://webdav.hidrive.strato.com``" -"IceDrive*","``https://webdav.icedrive.io/``" -"kDrive*","``https://connect.drive.infomaniak.com``" -"Koofr*","``https://app.koofr.net/dav/Koofr``" -"MagentaCLOUD*","``https://magentacloud.de/remote.php/webdav``" +"HiDrive IONOS [#note-hidrive-ionos]_","``https://webdav.hidrive.ionos.com``" +"HiDrive Strato [#note-hidrive-strato]_","``https://webdav.hidrive.strato.com``" +"IceDrive [#note-icedrive]_","``https://webdav.icedrive.io/``" +"kDrive [#note-kdrive]_","``https://connect.drive.infomaniak.com``" +"Koofr [#note-koofr]_","``https://app.koofr.net/dav/Koofr``" +"MagentaCLOUD [#note-magentacloud]_","``https://magentacloud.de/remote.php/webdav``" +"Mailbox.org","``https://dav.mailbox.org/servlet/webdav.infostore/``" "Mail.Ru","``https://webdav.cloud.mail.ru``" -"Nextcloud*","``https://{host}/{path}/remote.php/dav/files/{username}`` or ``https://{host}/{path}/remote.php/webdav``" -"ownCloud*","``https://{host}/{path}/remote.php/webdav``" -"pCloud* (US)","``https://webdav.pcloud.com``" -"pCloud* (EU)","``https://ewebdav.pcloud.com``" +"Nextcloud [#note-nextcloud]_","``https://{host}/{path}/remote.php/dav/files/{username}`` or ``https://{host}/{path}/remote.php/webdav``" +"ownCloud [#note-owncloud]_","``https://{host}/{path}/remote.php/webdav``" +"pCloud (EU) [#note-pcloud]_","``https://ewebdav.pcloud.com``" +"pCloud (US) [#note-pcloud]_","``https://webdav.pcloud.com``" "Seafile (self-hosted)","``https://{host}/{path}/seafdav``" "STACK","``https://{username}.stackstorage.com/remote.php/webdav``" "SWITCHdrive","``https://drive.switch.ch/remote.php/dav/files/{username}``" "Syncwerk (formerly Seafile.de)","``https://app.syncwerk.com/seafdav``" "WEB.DE Online-Speicher","``https://webdav.smartdrive.web.de``" "wölkli","``https://cloud.woelkli.com/remote.php/webdav``" -"Yandex.Disk*","``https://webdav.yandex.com``" -"Mailbox.org","``https://dav.mailbox.org/servlet/webdav.infostore/``" \ No newline at end of file +"Yandex.Disk [#note-yandex-disk]_","``https://webdav.yandex.com``" \ No newline at end of file diff --git a/source/misc/supported-cloud-services.rst b/source/misc/supported-cloud-services.rst index 0a2d325..87f5709 100644 --- a/source/misc/supported-cloud-services.rst +++ b/source/misc/supported-cloud-services.rst @@ -63,16 +63,17 @@ by both Cryptomator for Android and Cryptomator for iOS. :header-rows: 1 :file: ../_static/csv/clouds-with-webdav-support.csv -| \* Disroot: To login you must provide your disroot user_name (or your email if using with own domain) and password. If 2FA is enabled, generate app-specific-password -| \* IceDrive requires a paid plan and a separate access key as password. (see `here `_) -| \* kDrive disables WebDAV support for free users. -| \* Koofr needs a separate app password for WebDAV access. -| \* MagentaCLOUD needs a separate protocol password for WebDAV access. -| \* Nextcloud needs an app-specific password when 2FA is enabled. -| \* ownCloud needs an app-specific password when 2FA is enabled. -| \* pCloud disables WebDAV access when 2FA is enabled. Requires a paid plan. -| \* Yandex.Disk needs an app-specific password when 2FA is enabled. -| \* Strato and HiDrive using 2FA requires the OTP provided next to the password but it is only valid for 60 minutes then (see `here `_) +.. [#note-disroot] Disroot: To login, you must provide your disroot username (or your email if you are using your own domain) and your password. If 2FA is enabled you will have to generate an app-specific password. +.. [#note-hidrive-ionos] HiDrive IONOS: When using 2FA WebDAV requires the OTP provided next to the password but it is only valid for 30 minutes then (see `here \[de\] `__) +.. [#note-hidrive-strato] HiDrive Strato: When using 2FA WebDAV requires the OTP provided next to the password but it is only valid for 60 minutes then (see `here \[de\] `__) +.. [#note-icedrive] IceDrive: WebDAV requires a paid plan and a separate access key as password. (see `here `__) +.. [#note-kdrive] kDrive: WebDAV support is disabled for free users. +.. [#note-koofr] Koofr: WebDAV access requires a separate app password. +.. [#note-magentacloud] MagentaCLOUD: WebDAV access requires a separate protocol password. +.. [#note-nextcloud] Nextcloud: WebDAV requires an app-specific password when 2FA is enabled. +.. [#note-owncloud] ownCloud: WebDAV requires an app-specific password when 2FA is enabled. +.. [#note-pcloud] pCloud: WebDAV access is disabled when 2FA is enabled. Requires a paid plan. +.. [#note-yandex-disk] Yandex.Disk: WebDAV requires an app-specific password when 2FA is enabled. .. _misc/supported-cloud-services/incompatible-clouds: From a77febc353fd8d932ffdd9f6fc2e2c54f5f8cb94 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sat, 5 Oct 2024 01:58:25 +0200 Subject: [PATCH 4/9] Added "Incompatible Cloud Services" section --- source/_static/csv/incompatible-clouds.csv | 2 ++ source/misc/supported-cloud-services.rst | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 source/_static/csv/incompatible-clouds.csv diff --git a/source/_static/csv/incompatible-clouds.csv b/source/_static/csv/incompatible-clouds.csv new file mode 100644 index 0000000..d7a5479 --- /dev/null +++ b/source/_static/csv/incompatible-clouds.csv @@ -0,0 +1,2 @@ +"Cloud Service","Android Feature request","iOS Feature request" +"Mega","`#39 `_","`#258 `_" \ No newline at end of file diff --git a/source/misc/supported-cloud-services.rst b/source/misc/supported-cloud-services.rst index 87f5709..6f0669f 100644 --- a/source/misc/supported-cloud-services.rst +++ b/source/misc/supported-cloud-services.rst @@ -78,4 +78,11 @@ by both Cryptomator for Android and Cryptomator for iOS. .. _misc/supported-cloud-services/incompatible-clouds: Incompatible Cloud Services ---------------------------- \ No newline at end of file +--------------------------- + +| The Cloud Services listed in the following *non-exhaustive* table can currently **not** be used natively or via WebDAV. +| This applies to both Cryptomator for Android and Cryptomator for iOS. + +.. csv-table:: Incompatible Cloud Services + :header-rows: 1 + :file: ../_static/csv/incompatible-clouds.csv \ No newline at end of file From 169382555bbac89c4ac634edba430f723b38b1f1 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sat, 5 Oct 2024 02:23:46 +0200 Subject: [PATCH 5/9] Added download notes to "Android/Setup" page Refactored surrounding text to match added notes Added required CSS --- source/_static/css/overrides.css | 6 +++++ source/android/setup.rst | 39 +++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/source/_static/css/overrides.css b/source/_static/css/overrides.css index 5251099..2ad6c2c 100644 --- a/source/_static/css/overrides.css +++ b/source/_static/css/overrides.css @@ -35,4 +35,10 @@ border-color: #407F41; .rst-content .note, .rst-content .seealso, .rst-content .wy-alert-info.admonition, .rst-content .wy-alert-info.admonition-todo, .rst-content .wy-alert-info.attention, .rst-content .wy-alert-info.caution, .rst-content .wy-alert-info.danger, .rst-content .wy-alert-info.error, .rst-content .wy-alert-info.hint, .rst-content .wy-alert-info.important, .rst-content .wy-alert-info.tip, .rst-content .wy-alert-info.warning, .wy-alert.wy-alert-info { background: #EBF5EB; +} + +.rst-content .highlights { + margin-left: 0; + padding: 0 0.5em; + border-left: 0.25em solid #66CC68; } \ No newline at end of file diff --git a/source/android/setup.rst b/source/android/setup.rst index f00f0f9..4e9c530 100644 --- a/source/android/setup.rst +++ b/source/android/setup.rst @@ -44,6 +44,10 @@ To learn more about the supported Cloud Services, please see :ref:`Supported Clo Google Play Store ------------------ +.. highlights:: + | You can buy and download the Google Play Store variant of Cryptomator here: + | `Google Play Store`_ + If you have installed Cryptomator via the Google Play Store, you will receive updates as usual via the Google Play Store. After buying the app using the Google Play Store, it can be used with any number of devices that you have linked to the google account from your purchase. Furthermore it supports the "Google Play Family Library" function which means that the app can be used by up to 5 people in a family without having to buy it again. The conditions and how to create a “Google Play Family” can be found here: https://support.google.com/googleplay/answer/7007852?hl=en @@ -55,33 +59,52 @@ Sometimes the Google Play Store has problems to recognize that the app was alrea APK Store ------------ -The APK store variant can be installed from our website `https://cryptomator.org/android/ `_. Please verify the `SHA256 Signature` after downloading the APK before installing. The download is a so-called `APK` (Android application package), which is an installation archive. Install the app by simply clicking on the APK. +.. highlights:: + | You can buy a license for the app and download the APK Store variant of Cryptomator here: + | `APK Store`_ + +The APK store variant can be installed from the `APK Store`_ on our website. Please verify the `SHA256 Signature` after downloading the APK before installing. The download is a so-called `APK` (Android application package), which is an installation archive. Install the app by simply clicking on the APK. It is possible that the app in which you clicked on the APK is asking for "Install from Unknown Sources" permission, this is normal and must be activated for a short time (it is recommended to remove the permission afterwards). This variant does include an automatic updater that periodically checks if there is a newer version of this app, and if so, it can be downloaded and installed directly from within the app. Using the :ref:`Update Check Interval ` in the Cryptomator settings, you can specify how often the update check is executed. -As this variant wasn't bought using Google's Google Play Store you need to buy a license key from our website `https://cryptomator.org/android/ `_. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. +As this variant is not bought using the Google Play Store you need to buy a license key from the `APK Store`_ on our website. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. .. _android/setup/f-droid-repository: Cryptomator F-Droid repository -------------------------------- -The Cryptomator F-Droid repository variant can be installed after adding our F-Droid repository to the F-Droid app by opening `this link `_ on the device or scanning the following QR-Code: +.. highlights:: + | You can buy a license for the Cryptomator F-Droid repository variant of Cryptomator here: + | `APK Store`_ + +.. highlights:: + | You can download the Cryptomator F-Droid repository variant of Cryptomator from F-Droid after adding our F-Droid + repository to the F-Droid app by opening this link on the device or by scanning the following QR-Code: + | `Cryptomator F-Droid repository`_ -.. image:: ../img/android/fdroid-qr-code.svg - :alt: How to handle cloud services with Android - :width: 128px + .. image:: ../img/android/fdroid-qr-code.svg + :alt: How to handle cloud services with Android + :width: 128px -As well as using the APK Store variant because this app variant wasn't bought using Google's Google Play Store you need to buy a license key from our website `https://cryptomator.org/android/ `_. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. +As with the APK Store variant, since this app variant is not purchased via the Google Play Store, you need to buy a license key from the `APK Store`_ on our website. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. .. _android/setup/f-droid-main-repository: Main F-Droid repository ------------------------ -The Main F-Droid repository variant can be installed directly from the `Main F-Droid repository `_. Regarding the license key, the same applies as with the :ref:`Cryptomator F-Droid repository ` variant. +.. highlights:: + | You can buy a license for the Main F-Droid repository variant of Cryptomator here: + | `APK Store`_ + +.. highlights:: + | You can download the Main F-Droid repository variant of Cryptomator here: + | `Main F-Droid repository`_ + +The Main F-Droid repository variant can be installed directly from the `Main F-Droid repository.
`_ Regarding the license key, the same applies as with the :ref:`Cryptomator F-Droid repository ` variant. Unlike all other variants of Cryptomator for Android, this variant has its own package name: ``org.cryptomator.lite``. It means that you cannot, intentionally or unintentionally, simply switch between this and the other variants. It requires to setup the app again. The reason we decided to do this is that other Cryptomator variants already exist in some popular F-Droid repositories, and if we hadn't decided to do this, there could have been an unwanted variant switch. From a98efbbb0971e52f1caac33b514048fc07ce40c3 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sun, 6 Oct 2024 04:00:41 +0200 Subject: [PATCH 6/9] Inserted formatting and links --- source/android/setup.rst | 60 +++++++++++++----------- source/misc/supported-cloud-services.rst | 7 ++- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/source/android/setup.rst b/source/android/setup.rst index 4e9c530..3a02e13 100644 --- a/source/android/setup.rst +++ b/source/android/setup.rst @@ -11,7 +11,7 @@ You can get Cryptomator for Android on No matter which variant of the app you choose: The key functionality of Cryptomator stays the same. | The variants only differ in terms of the :ref:`supported Cloud Services,` the way they are downloaded and the way a license is acquired. - If you have access to the Google Play Store on your device, **we recommend using the Google Play Store variant of Cryptomator.** + If you have access to the *Google Play Store* on your device, **we recommend using the** |GooglePlayStoreVariant|_ **of Cryptomator.** | Otherwise, please keep reading. .. _android/setup/variant-differences: @@ -22,20 +22,21 @@ Differences between variants and how to choose While all variants of the Cryptomator for Android app have the same key functionality, you should make sure to pick the perfect variant for you: -Most users will want to use the Google Play Store or the APK Store as installation type. Both variants have access to all -supported Cloud Services and allow for maximum flexibility. While the Google Play Store variant can be purchased and downloaded via its -Google Play Store page, the APK Store variant and the accompanying license must be obtained via our website. +Most users will want to use the :ref:`Google Play Store` or the :ref:`APK Store` as installation type. Both variants have access to all +:ref:`supported Cloud Services` and allow for maximum flexibility. While the *Google Play Store variant* can be purchased and downloaded via its +*Google Play Store* page, the *APK Store variant* and the accompanying license must be obtained via our website. -| The Cryptomator F-Droid repo variant and Main F-Droid repo variant both **don't** support Google Drive as Cloud Service because +| The :ref:`Cryptomator F-Droid repo variant` and :ref:`Main F-Droid repo variant` both **don't** support Google Drive as Cloud Service because Google Drive requires proprietary dependencies which doesn’t fit the spirit of F-Droid. - Additionally the Main F-Droid repo variant **doesn't** support **any** Cloud Services that require an API key. + Additionally the *Main F-Droid repo variant* **doesn't** support **any** Cloud Services that require an API key. | Both can be downloaded from their corresponding F-Droid repository and require a license which can be obtained via - our website. -| The APK Store and F-Droid variants of Cryptomator were created to serve users who do not have the Google Play Store installed + `our website. `_ +| The *APK Store* and *F-Droid variants* of Cryptomator were created to serve users who do not have the *Google Play Store* installed on their Android device or do not want their purchases to go through Google. -If you have access to the Google Play Store on your device, **we recommend using the Google Play Store variant of Cryptomator** -for the best user experience and maximum flexibility. +.. note:: + If you have access to the *Google Play Store* on your device, **we recommend using the** |GooglePlayStoreVariant|_ **of Cryptomator** + for the best user experience and maximum flexibility. To learn more about the supported Cloud Services, please see :ref:`Supported Cloud Services.` @@ -45,14 +46,14 @@ Google Play Store ------------------ .. highlights:: - | You can buy and download the Google Play Store variant of Cryptomator here: + | You can buy and download the *Google Play Store variant* of Cryptomator here: | `Google Play Store`_ -If you have installed Cryptomator via the Google Play Store, you will receive updates as usual via the Google Play Store. +If you have installed Cryptomator via the *Google Play Store,* you will receive updates as usual via the *Google Play Store.* -After buying the app using the Google Play Store, it can be used with any number of devices that you have linked to the google account from your purchase. Furthermore it supports the "Google Play Family Library" function which means that the app can be used by up to 5 people in a family without having to buy it again. The conditions and how to create a “Google Play Family” can be found here: https://support.google.com/googleplay/answer/7007852?hl=en +After buying the app using the *Google Play Store,* it can be used with any number of devices that you have linked to the google account from your purchase. Furthermore it supports the "Google Play Family Library" function which means that the app can be used by up to 5 people in a family without having to buy it again. The conditions and how to create a “Google Play Family” can be found here: https://support.google.com/googleplay/answer/7007852?hl=en -Sometimes the Google Play Store has problems to recognize that the app was already bought and asks you to buy again the app, see this topic to recover from this problem: `On how many devices can the app be installed using Google Play Store? `_ +Sometimes the *Google Play Store* has problems to recognize that the app was already bought and asks you to buy again the app, see this topic to recover from this problem: `On how many devices can the app be installed using Google Play Store? `_ .. _android/setup/apk-store: @@ -60,16 +61,16 @@ APK Store ------------ .. highlights:: - | You can buy a license for the app and download the APK Store variant of Cryptomator here: + | You can buy a license for the app and download the *APK Store variant* of Cryptomator here: | `APK Store`_ -The APK store variant can be installed from the `APK Store`_ on our website. Please verify the `SHA256 Signature` after downloading the APK before installing. The download is a so-called `APK` (Android application package), which is an installation archive. Install the app by simply clicking on the APK. +The *APK store variant* can be installed from the `APK Store`_ on our website. Please verify the `SHA256 Signature` after downloading the APK before installing. The download is a so-called `APK` (Android application package), which is an installation archive. Install the app by simply clicking on the APK. It is possible that the app in which you clicked on the APK is asking for "Install from Unknown Sources" permission, this is normal and must be activated for a short time (it is recommended to remove the permission afterwards). This variant does include an automatic updater that periodically checks if there is a newer version of this app, and if so, it can be downloaded and installed directly from within the app. Using the :ref:`Update Check Interval ` in the Cryptomator settings, you can specify how often the update check is executed. -As this variant is not bought using the Google Play Store you need to buy a license key from the `APK Store`_ on our website. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. +As this variant is not bought using the *Google Play Store* you need to buy a license key from the `APK Store`_ on our website. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with ``cryptomator://license/YOUR_LICENSE_KEY``. .. _android/setup/f-droid-repository: @@ -77,11 +78,11 @@ Cryptomator F-Droid repository -------------------------------- .. highlights:: - | You can buy a license for the Cryptomator F-Droid repository variant of Cryptomator here: + | You can buy a license for the *Cryptomator F-Droid repository variant* of Cryptomator here: | `APK Store`_ .. highlights:: - | You can download the Cryptomator F-Droid repository variant of Cryptomator from F-Droid after adding our F-Droid + | You can download the *Cryptomator F-Droid repository variant* of Cryptomator from F-Droid after adding our F-Droid repository to the F-Droid app by opening this link on the device or by scanning the following QR-Code: | `Cryptomator F-Droid repository`_ @@ -89,7 +90,7 @@ Cryptomator F-Droid repository :alt: How to handle cloud services with Android :width: 128px -As with the APK Store variant, since this app variant is not purchased via the Google Play Store, you need to buy a license key from the `APK Store`_ on our website. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with `cryptomator://license/YOUR_LICENSE_KEY`. +As with the *APK Store variant,* since this app variant is not purchased via the *Google Play Store,* you need to buy a license key from the `APK Store`_ on our website. After Cryptomator is installed, you have to enter this key. This can be done by copying and pasting the license into the field when asked for it or by clicking on the link starting with ``cryptomator://license/YOUR_LICENSE_KEY``. .. _android/setup/f-droid-main-repository: @@ -97,14 +98,14 @@ Main F-Droid repository ------------------------ .. highlights:: - | You can buy a license for the Main F-Droid repository variant of Cryptomator here: + | You can buy a license for the *Main F-Droid repository variant* of Cryptomator here: | `APK Store`_ .. highlights:: - | You can download the Main F-Droid repository variant of Cryptomator here: + | You can download the *Main F-Droid repository variant* of Cryptomator here: | `Main F-Droid repository`_ -The Main F-Droid repository variant can be installed directly from the `Main F-Droid repository.
`_ Regarding the license key, the same applies as with the :ref:`Cryptomator F-Droid repository ` variant. +The *Main F-Droid repository variant* can be installed directly from the `Main F-Droid repository.
`_ Regarding the license key, the same applies as with the :ref:`Cryptomator F-Droid repository variant.` Unlike all other variants of Cryptomator for Android, this variant has its own package name: ``org.cryptomator.lite``. It means that you cannot, intentionally or unintentionally, simply switch between this and the other variants. It requires to setup the app again. The reason we decided to do this is that other Cryptomator variants already exist in some popular F-Droid repositories, and if we hadn't decided to do this, there could have been an unwanted variant switch. @@ -122,12 +123,15 @@ Update Rollout The timing of the update depends on your installed variant: -* Google Play Store: Updates are reviewed by Google, so it may take a few days before the update is available. -* APK Store: Updates are available as they are released. -* Cryptomator F-Droid Repo: Updates are available as they are released. -* Main F-Droid Repo: Updates are available as soon as the F-Droid maintainers have built the application, which can take a few days. +* *Google Play Store:* Updates are reviewed by Google, so it may take a few days before the update is available. +* *APK Store:* Updates are available as they are released. +* *Cryptomator F-Droid Repo:* Updates are available as they are released. +* *Main F-Droid Repo:* Updates are available as soon as the F-Droid maintainers have built the application, which can take a few days. .. _`Google Play Store`: https://play.google.com/store/apps/details?id=org.cryptomator&hl=en .. _`APK Store`: https://cryptomator.org/android/ .. _`Cryptomator F-Droid repository`: https://static.cryptomator.org/android/fdroid/repo?fingerprint=F7C3EC3B0D588D3CB52983E9EB1A7421C93D4339A286398E71D7B651E8D8ECDD -.. _`Main F-Droid repository`: https://f-droid.org/en/packages/org.cryptomator.lite \ No newline at end of file +.. _`Main F-Droid repository`: https://f-droid.org/en/packages/org.cryptomator.lite + +.. |GooglePlayStoreVariant| replace:: **Google Play Store variant** +.. _GooglePlayStoreVariant: `android/setup/google-playstore`_ \ No newline at end of file diff --git a/source/misc/supported-cloud-services.rst b/source/misc/supported-cloud-services.rst index 6f0669f..5ab26b0 100644 --- a/source/misc/supported-cloud-services.rst +++ b/source/misc/supported-cloud-services.rst @@ -35,7 +35,7 @@ The following Cloud Services are natively supported by Cryptomator for Android a :header-rows: 1 :file: ../_static/csv/natively-supported-clouds.csv -.. [#playstore-recommendation] **We recommend using the Google Play Store variant of Cryptomator for Android users** +.. [#playstore-recommendation] **We recommend using the** |GooglePlayStoreVariant|_ **of Cryptomator for Android users** for the best experience. Please see :ref:`here ` for more information about the different Cryptomator for Android variants and the reasoning behind those. .. [#except-f-droid-main] Not supported by the :ref:`Main F-Droid repo variant ` @@ -85,4 +85,7 @@ Incompatible Cloud Services .. csv-table:: Incompatible Cloud Services :header-rows: 1 - :file: ../_static/csv/incompatible-clouds.csv \ No newline at end of file + :file: ../_static/csv/incompatible-clouds.csv + +.. |GooglePlayStoreVariant| replace:: **Google Play Store variant** +.. _GooglePlayStoreVariant: ../android/setup.html#google-play-store \ No newline at end of file From e1411c148b7ad458d4e7c0ad0695da3e9324f770 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sat, 5 Oct 2024 01:32:17 +0200 Subject: [PATCH 7/9] Adjusted related pages Replaced now outdated links with links to "Supported Cloud Services" page Unified terminology --- source/android/cloud-management.rst | 5 +++-- source/android/settings.rst | 6 +++--- source/android/vault-management.rst | 16 +++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/source/android/cloud-management.rst b/source/android/cloud-management.rst index 89ca90b..eb82b0e 100644 --- a/source/android/cloud-management.rst +++ b/source/android/cloud-management.rst @@ -13,7 +13,7 @@ Please enter the credentials for your provider account or in case of Google Driv If your authentication was successful, some of the providers might ask you to grant Cryptomator access permission to your online files. Please allow this permission. -In Google Drive, OneDrive and Dropox you can only create one connection between your cloud storage account and the Cryptomator app. +In Google Drive, OneDrive and Dropbox you can only create one connection between your Cloud Service account and the Cryptomator app. You can't connect to (for example) two different *Dropbox* accounts. If the provider requested permission to access your online files you can remove Cryptomator permissions from your online storage account at any time. @@ -60,7 +60,8 @@ Login OneDrive Login WebDAV ------------------ -You can find `here `_ a list of the most common WebDAV URLs. +Please see :ref:`misc/supported-cloud-services/clouds-with-webdav-support` for a non-exhaustive list of Cloud Services +and information about accessing them with WebDAV. .. image:: ../img/android/add-webdav-login-provider-0.png :alt: How to handle cloud services with Android diff --git a/source/android/settings.rst b/source/android/settings.rst index a78ba1b..f698593 100644 --- a/source/android/settings.rst +++ b/source/android/settings.rst @@ -24,7 +24,7 @@ After pressing the three dots ① and clicking on ``Settings``, you will find op Cloud Services ^^^^^^^^^^^^^^ -This setting lists all cloud services. When pressing on a service, the authentication starts or if you're already authenticated, you will be logged out. +This setting lists all Cloud Services. When pressing on a service, the authentication starts or if you're already authenticated, you will be logged out. .. image:: ../img/android/setting-cloud-services.png :alt: How to handle cloud services with Android @@ -212,7 +212,7 @@ If so it will not be downloaded again but directly retrieved from the file syste Cache Size Per Cloud ^^^^^^^^^^^^^^^^^^^^^^^^^^ -Using this setting, you can specify the total max cache size per cloud provider. +Using this setting, you can specify the total max cache size per Cloud Service. You can choose between the following options: @@ -276,7 +276,7 @@ Version This setting displays the current version of this app. -The following sub settings are only available, if you're using the APK-Store version of Cryptomator and not the PlayStore one. +The following sub settings are only available, if you're using the APK-Store variant of Cryptomator and not the Google Play Store one. .. _android/settings/update-check-interval: diff --git a/source/android/vault-management.rst b/source/android/vault-management.rst index bb78893..86520b4 100644 --- a/source/android/vault-management.rst +++ b/source/android/vault-management.rst @@ -22,12 +22,13 @@ To create a new vault, click on the plus sign ① and choose *Create new vault* If you already have a vault created with the desktop app and just want to add this vault to your mobile app, please select go to chapter ``Add Existing Vaults``. -You will now be prompted to select the cloud provider where you want to store your vault. +You will now be prompted to select the Cloud Service where you want to store your vault. Choose between *Dropbox*, *Google Drive*, *OneDrive* (works also with *OneDrive for Business*) or *Local storage* (which means your local device with all attached devices). -If your desired provider is not listed and offers WebDAV access, please select *WebDAV* as the storage location of your vault. -Here you can find `WebDAV URLs of Common Cloud Storage Services `_. +| If your desired provider is not listed and offers WebDAV access, please select *WebDAV* as the storage location of your vault. +| Please see :ref:`misc/supported-cloud-services/clouds-with-webdav-support` for a non-exhaustive list of Cloud Services + and information about accessing them with WebDAV. .. image:: ../img/android/create-new-vault-2-select-provider.png :alt: How to create a new vault with Android @@ -44,7 +45,7 @@ This name will also be the folder name of your vault files in your online storag :alt: How to create a new vault with Android :width: 346px -Then choose the location on your cloud storage where you want to have your encrypted vault files stored. +Then choose the location on your Cloud Service where you want to have your encrypted vault files stored. .. image:: ../img/android/create-new-vault-6-select-path.png :alt: How to create a new vault with Android @@ -88,12 +89,13 @@ To add an existing vault, click on the plus sign ① and choose *Add existing va :alt: How to add a vault with Android :width: 346px -You will now be prompted to select the cloud provider where the vault is located. +You will now be prompted to select the Cloud Service where the vault is located. Choose between *Dropbox*, *Google Drive*, *OneDrive* (works also with *OneDrive for Business*) or *Local storage* (which means your local device with all attached devices). -If your desired provider is not listed and offers WebDAV access, please select *WebDAV* as the storage location of your vault. -Here you can find `WebDAV URLs of Common Cloud Storage Services `_. +| If your desired provider is not listed and offers WebDAV access, please select *WebDAV* as the storage location of your vault. +| Please see :ref:`misc/supported-cloud-services/clouds-with-webdav-support` for a non-exhaustive list of Cloud Services + and information about accessing them with WebDAV. .. image:: ../img/android/add-existing-vault-2-select-provider.png :alt: How add a vault with Android From cf75a3f6e029b20d51b7c3b02fec566f32ff97a2 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Sat, 5 Oct 2024 01:51:36 +0200 Subject: [PATCH 8/9] Removed deprecated link for Nextcloud --- source/_static/csv/clouds-with-webdav-support.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_static/csv/clouds-with-webdav-support.csv b/source/_static/csv/clouds-with-webdav-support.csv index bb50e39..8466e26 100644 --- a/source/_static/csv/clouds-with-webdav-support.csv +++ b/source/_static/csv/clouds-with-webdav-support.csv @@ -13,7 +13,7 @@ "MagentaCLOUD [#note-magentacloud]_","``https://magentacloud.de/remote.php/webdav``" "Mailbox.org","``https://dav.mailbox.org/servlet/webdav.infostore/``" "Mail.Ru","``https://webdav.cloud.mail.ru``" -"Nextcloud [#note-nextcloud]_","``https://{host}/{path}/remote.php/dav/files/{username}`` or ``https://{host}/{path}/remote.php/webdav``" +"Nextcloud [#note-nextcloud]_","``https://{host}/{path}/remote.php/dav/files/{username}``" "ownCloud [#note-owncloud]_","``https://{host}/{path}/remote.php/webdav``" "pCloud (EU) [#note-pcloud]_","``https://ewebdav.pcloud.com``" "pCloud (US) [#note-pcloud]_","``https://webdav.pcloud.com``" From 6488d6415d9f8156ccd714bfeb9909e33bb57915 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:50:05 +0200 Subject: [PATCH 9/9] Applied suggestion from code review (deleted sentence) Co-authored-by: Julian Raufelder --- source/misc/supported-cloud-services.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/misc/supported-cloud-services.rst b/source/misc/supported-cloud-services.rst index 5ab26b0..60359ed 100644 --- a/source/misc/supported-cloud-services.rst +++ b/source/misc/supported-cloud-services.rst @@ -45,7 +45,7 @@ The following Cloud Services are natively supported by Cryptomator for Android a .. [#note-app-spaces] Some Android and iOS apps integrate into the operating system's file manager with their own storage spaces to allow seamless access to their files via so called "File Providers." Cryptomator generally supports saving vaults in those spaces, but is dependent on those apps explicitly supporting access by other - apps like Cryptomator. This is not a limitation of Cryptomator and needs to be addressed by those apps. + apps like Cryptomator. For more technical information about this see `here `__ for Android and `here `__ for iOS. .. [#note-webdav] Please see :ref:`misc/supported-cloud-services/clouds-with-webdav-support` for a non-exhaustive list