Merge pull request #1845 from nextcloud/vasyugan-patch-1

DAVX5 setup through Nextcloud mobile, GNOME automount of Nextcloud webdav

user_manual/files/access_webdav.rst

@@ -58,8 +58,13 @@ You can access files in Linux operating systems using the following methods.
 Nautilus file manager
 ^^^^^^^^^^^^^^^^^^^^^
 
-Use the ``davs://`` protocol to connect the Nautilus file manager to your
-Nextcloud share::
+**When you configure your Nextcloud account in the** `GNOME Control Center
+<../pim/sync_gnome.html>`_, **your files will automatically be mounted
+by Nautilus as a WebDAV share, unless you deselect file access.**
+
+You can also mount your Nextcloud files manually. Use the ``davs://``
+protocol to connect the Nautilus file manager to your Nextcloud
+share::
 
   davs://example.com/nextcloud/remote.php/dav/files/USERNAME/
 
@@ -69,7 +74,9 @@ Nextcloud share::
 .. image:: ../images/webdav_gnome3_nautilus.png
    :alt: screenshot of configuring Nautilus file manager to use WebDAV
 
-If you `configure your Nextcloud account in the GNOME Control Center <../pim/sync_gnome.html>`_ , your files will automatically be mounted by Nautilus as a WebDAV share.
+.. note:: The same method works for other file managers that use GVfs,
+	  such as MATE's Caja and Cinnamon's Nepomuk.
+
 
 Accessing files with KDE and Dolphin file manager
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

user_manual/pim/sync_android.rst

@@ -2,17 +2,73 @@
 Synchronizing with Android
 ==========================
 
+Files and notifications
+-----------------------
+
+1. Install the Nextcloud Android client `from F-Droid
+   <https://f-droid.org/de/packages/com.nextcloud.client/>`_ or `Google
+   Play Store
+   <https://play.google.com/store/apps/details?id=com.nextcloud.client>`_
+2. Start the app. There are two ways of setting it up:
+
+   *Either*: enter
+   your server URL, continue, enter your user name and password and
+   confirm to grant access.
+
+   *Or*: In Nextcloud's web GUI, go to the
+   `user preferences <../userpreferences.html>`_, go to
+   **Security**. Generate an App password, click "Generate QR code" and
+   tap the QR scanner icon in the Nextcloud app, point your phone's
+   camera towards the screen.
+
 Contacts and Calendar
 ---------------------
 
-1. Install `DAVx⁵ (formerly known as DAVDroid) <https://www.davx5.com/download/>`_ on your Android device.
-2. Create a new account ("+" button).
-3. Select **Connection with URL and username**.
+With the Nextcloud mobile app
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+1. Install `DAVx⁵ (formerly known as DAVDroid)
+   <https://www.davx5.com/download/>`_ on your Android device, `from
+   Google Play store <https://play.google.com/store/apps/details?id=at.bitfire.davdroid>`_ or `from F-Droid
+   <https://f-droid.org/de/packages/at.bitfire.davdroid/>`_
+2. In the Nextcloud mobile, go
+   to **Settings** / **More**, tap on "**Sync caldendars & contacts**"
+3. Now, DAVx⁵ will open Nextcloud's Webflow login window, where you
+   will have to enter your credendials and grant access.
+4. After this, DAVx⁵ will close and the Nextcloud app reappears. In
+   order to finish setup, you have to manually launch DAVx⁵ again.
+5. Tap on the icon for the account DAVx⁵ has just created, when requested grant DAVx⁵ access
+   to your calendars and contacts, optionally install `OpenTasks
+   <https://play.google.com/store/apps/details?id=org.dmfs.tasks>`_  and
+   grant DAVx⁵ access to your tasks, too.
+6. When you tap the icon for the account DAVx⁵ has set up, it will
+   discover the available address books and calendars. Choose which
+   ones you want to synchronize and finishish.
+
+
+Without the Nextcloud mobile app
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+If you don't want to install the Nextcloud mobile app, the following
+steps are required after installing DAVx⁵
+
+1. Install `DAVx⁵ (formerly known as DAVDroid) <https://www.davx5.com/download/>`_ on your Android device, `from
+   Google Play store <https://play.google.com/store/apps/details?id=at.bitfire.davdroid>`_ or `from F-Droid
+   <https://f-droid.org/de /packages/at.bitfire.davdroid/>`_.
+2. Optionally install `OpenTasks <https://play.google.com/store/apps/details?id=org.dmfs.tasks>`_.
+3. Create a new account ("+" button).
+4. Select **Connection with URL and username**.
    **Base URL:** URL of your Nextcloud instance (e.g. ``https://sub.example.com/remote.php/dav``)
    **Contact Group Method:** As credentials
-4. Chose the option ``Groups are per-contact categories``.
-5. Click **Connect**.
-6. Select the data you want to sync.
-
+5. Chose the option ``Groups are per-contact categories``.
+6. Click **Connect**.
+7. Select the data you want to sync.
+8. When requested, grant access permissions to DAVx⁵ for your
+   contacts, calendars and optionally tasks.
+   
 .. note:: Enter your email address as DAVx⁵ account name (mandatory if you want 
-   to be able to send calendar invitation)
+   to be able to send calendar invitation) If your email address is
+   registered in your Nextcloud preferences and you have set up your
+   account using the Nextcloud mobile app, this should be aready the case.
+
+
+   

user_manual/pim/sync_gnome.rst

@@ -17,7 +17,7 @@ This can be done by following these steps:
 
 3. Enter your server URL, username and password. If you have enabled two
    factor authentification, you need to generate an
-   app-password/token, because GNOME doesn't support OAuth yet. (`Learn more <https://docs.nextcloud.com/server/stable/user_manual/session_management.html#managing-devices>`_).
+   app-password/token, because GNOME Online Accounts `doesn't support Nextcloud's webflow login yet <https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/81>`_. (`Learn more <https://docs.nextcloud.com/server/stable/user_manual/session_management.html#managing-devices>`_).
 
 .. image:: ../images/goa-add-nextcloud-account.png