Bump version to 2.6.0

Signed-off-by: Camila San <hello@camila.codes>
2026-04-03 09:11:33 +02:00 · 2019-09-27 17:01:24 +02:00
214 changed files with 30532 additions and 40267 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -237,17 +237,13 @@ name: qt-5.12

 steps:
 - name: build and test
-  image: nextcloudci/client-5.12:client-5.12-5
+  image: nextcloudci/client-5.12:client-5.12-2
  commands:
    # Install QtKeyChain
    - /bin/bash -c "
      export CC=gcc-7 &&
      export CXX=g++-7 &&
-      export QT_BASE_DIR=/opt/qt5.12.5 &&
-      export QTDIR=\$QT_BASE_DIR &&
-      export PATH=\$QT_BASE_DIR/bin:\$PATH &&
-      export LD_LIBRARY_PATH=\$QT_BASE_DIR/lib/x86_64-linux-gnu:\$QT_BASE_DIR/lib:/usr/local/lib:\$LD_LIBRARY_PATH &&
-      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      source /opt/qt512/bin/qt512-env.sh &&
      cd /tmp &&
      git clone https://github.com/frankosterfeld/qtkeychain.git &&
      cd qtkeychain &&
@@ -261,11 +257,7 @@ steps:
    - /bin/bash -c "
      export CC=gcc-7 &&
      export CXX=g++-7 &&
-      export QT_BASE_DIR=/opt/qt5.12.5 &&
-      export QTDIR=\$QT_BASE_DIR &&
-      export PATH=\$QT_BASE_DIR/bin:\$PATH &&
-      export LD_LIBRARY_PATH=\$QT_BASE_DIR/lib/x86_64-linux-gnu:\$QT_BASE_DIR/lib:/usr/local/lib:\$LD_LIBRARY_PATH &&
-      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      source /opt/qt512/bin/qt512-env.sh &&
      mkdir build &&
      cd build &&
      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
@@ -286,17 +278,13 @@ name: qt-5.12-clang

 steps:
 - name: build and test
-  image: nextcloudci/client-5.12:client-5.12-5
+  image: nextcloudci/client-5.12:client-5.12-2
  commands:
    # Install QtKeyChain
    - /bin/bash -c "
      export CC=clang-6.0 &&
      export CXX=clang++-6.0 &&
-      export QT_BASE_DIR=/opt/qt5.12.5 &&
-      export QTDIR=\$QT_BASE_DIR &&
-      export PATH=\$QT_BASE_DIR/bin:\$PATH &&
-      export LD_LIBRARY_PATH=\$QT_BASE_DIR/lib/x86_64-linux-gnu:\$QT_BASE_DIR/lib:/usr/local/lib:\$LD_LIBRARY_PATH &&
-      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      source /opt/qt512/bin/qt512-env.sh &&
      cd /tmp &&
      git clone https://github.com/frankosterfeld/qtkeychain.git &&
      cd qtkeychain &&
@@ -310,11 +298,7 @@ steps:
    - /bin/bash -c "
      export CC=clang-6.0 &&
      export CXX=clang++-6.0 &&
-      export QT_BASE_DIR=/opt/qt5.12.5 &&
-      export QTDIR=\$QT_BASE_DIR &&
-      export PATH=\$QT_BASE_DIR/bin:\$PATH &&
-      export LD_LIBRARY_PATH=\$QT_BASE_DIR/lib/x86_64-linux-gnu:\$QT_BASE_DIR/lib:/usr/local/lib:\$LD_LIBRARY_PATH &&
-      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      source /opt/qt512/bin/qt512-env.sh &&
      mkdir build &&
      cd build &&
      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
@@ -335,10 +319,9 @@ name: AppImage

 steps:
 - name: build
-  image: nextcloudci/client-5.12:client-5.12-5
+  image: nextcloudci/client-5.12:client-5.12-2
  commands:
    - /bin/bash -c "./admin/linux/build-appimage.sh"
-    - /bin/bash -c "./admin/linux/upload-appimage.sh"
 trigger:
  branch:
    - master
@@ -361,9 +344,10 @@ steps:
      from_secret: DEBIAN_SECRET_IV
 trigger:
  branch:
-    - stable-2.6
+    - master
  event:
-    - tag
+    - pull_request
+    - push
 ---
 kind: pipeline
 name: Documentation
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "src/3rdparty/qtmacgoodies"]
+	path = src/3rdparty/qtmacgoodies
+	url = https://github.com/camilasan/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
--- a/.tx/nextcloud.client-desktop/cy_GB_translation
+++ b/.tx/nextcloud.client-desktop/cy_GB_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Icon[cy_GB]=@APPLICATION_ICON_NAME@
-Name[cy_GB]=@APPLICATION_NAME@ cleient cydweddu bwrdd gwaith
-Comment[cy_GB]=@APPLICATION_NAME@ cleient cydweddu bwrdd gwaith
-GenericName[cy_GB]=Cydweddu Ffolder
--- a/.tx/nextcloud.client-desktop/el_translation
+++ b/.tx/nextcloud.client-desktop/el_translation
@@ -198,7 +198,4 @@ X-GNOME-Autostart-Delay=3


 # Translations
-Icon[el]=@APPLICATION_ICON_NAME@
-Name[el]=@APPLICATION_NAME@ πρόγραμμα συγχρονισμού
-Comment[el]=@APPLICATION_NAME@ πρόγραμμα συγχρονισμού
 GenericName[el]=Συγχρονισμός φακέλου
--- a/.tx/nextcloud.client-desktop/ro_translation
+++ b/.tx/nextcloud.client-desktop/ro_translation
@@ -201,4 +201,4 @@ X-GNOME-Autostart-Delay=3
 Icon[ro]=@APPLICATION_ICON_NAME@
 Name[ro]=@APPLICATION_NAME@ client de sincronizare pentru desktop
 Comment[ro]=@APPLICATION_NAME@ client de sincronizare pentru desktop
-GenericName[ro]=Sincronizare director
+GenericName[ro]=Sincronizare dosare
--- a/.tx/nextcloud.client-desktop/sk_translation
+++ b/.tx/nextcloud.client-desktop/sk_translation
@@ -201,4 +201,4 @@ X-GNOME-Autostart-Delay=3
 Icon[sk_SK]=@APPLICATION_ICON_NAME@
 Name[sk_SK]=@APPLICATION_NAME@ synchronizačný klient pre PC
 Comment[sk_SK]=@APPLICATION_NAME@ synchronizačný klient pre PC
-GenericName[sk_SK]=Synchronizácia priečinkov
+GenericName[sk_SK]=Synchnonizácia priečinkov
--- a/.tx/nextcloud.client-desktop/sl_translation
+++ b/.tx/nextcloud.client-desktop/sl_translation
@@ -199,6 +199,6 @@ X-GNOME-Autostart-Delay=3

 # Translations
 Icon[sl]=@APPLICATION_ICON_NAME@
-Name[sl]=@APPLICATION_NAME@ program za usklajevanje
-Comment[sl]=@APPLICATION_NAME@ program za usklajevanje
+Name[sl]=@APPLICATION_NAME@ odjemalec za usklajevanje
+Comment[sl]=@APPLICATION_NAME@ odjemalec za usklajevanje
 GenericName[sl]=Usklajevanje map
--- a/.tx/nextcloud.client-desktop/sw_translation
+++ b/.tx/nextcloud.client-desktop/sw_translation
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Icon[sw]=@APPLICATION_ICON_NAME@
-Name[sw]=Teja ya @APPLICATION_NAME@ ya kufanana faili kwa seva na faili ziko hapa
-Comment[sw]=Teja ya @APPLICATION_NAME@ ya kufanana faili kwa seva na faili ziko hapa 
-GenericName[sw]=Fanana Kabrasha
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,16 +203,8 @@ if( WIN32 )
 add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
 add_definitions( -DNOMINMAX )
 # Get APIs from from Vista onwards.
-add_definitions( -D_WIN32_WINNT=0x0601 )
-add_definitions( -DWINVER=0x0601 )
-    if( MSVC )
-    # Use automatic overload for suitable CRT safe-functions
-    # See https://docs.microsoft.com/de-de/cpp/c-runtime-library/security-features-in-the-crt?view=vs-2019
-    add_definitions( -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 )
-    # Also: Disable compiler warnings because we don't use Windows CRT safe-functions explicitly and don't intend to
-    # as this is a pure cross-platform source the only alternative would be a ton of ifdefs with calls to the _s version
-    add_definitions( -D_CRT_SECURE_NO_WARNINGS )
-    endif( MSVC )
+add_definitions( -D_WIN32_WINNT=0x0600)
+add_definitions( -DWINVER=0x0600)
 endif( WIN32 )

 if (APPLE)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 6 )
-set( MIRALL_VERSION_PATCH 2 )
+set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_VERSION_YEAR  2019 )
 set( MIRALL_SOVERSION 0 )

--- a/admin/linux/Dockerfile
+++ b/admin/linux/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --
        libsqlite3-dev \
        libssl-dev \
        libcmocka-dev \
-        libcloudproviders-dev \
        qt5-default \
        qttools5-dev-tools \
        libqt5webkit5-dev \
--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -6,7 +6,7 @@ mkdir /app
 mkdir /build

 #Set Qt-5.12
-export QT_BASE_DIR=/opt/qt5.12.5
+export QT_BASE_DIR=/opt/qt512
 export QTDIR=$QT_BASE_DIR
 export PATH=$QT_BASE_DIR/bin:$PATH
 export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
@@ -66,8 +66,7 @@ rm -rf ./usr/share/nemo-python/
 mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./etc

-DESKTOP_FILE=/app/usr/share/applications/${LINUX_APPLICATION_ID}.desktop
-sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' ${DESKTOP_FILE} # Bug in desktop file?
+sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop # Bug in desktop file?
 cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linuxeployqt bug, FIXME


@@ -88,12 +87,17 @@ chmod a+x linuxdeployqt*.AppImage
 rm ./linuxdeployqt-continuous-x86_64.AppImage
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/app/usr/lib/
-./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs
+./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs

 # Set origin
 ./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0

 # Build AppImage
-./squashfs-root/AppRun ${DESKTOP_FILE} -appimage
+./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -appimage

 mv Nextcloud*.AppImage Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
+
+curl --upload-file $(readlink -f ./Nextcloud*.AppImage) https://transfer.sh/Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
+
+echo
+echo "Get the AppImage at the link above!"
--- a/admin/linux/debian/debian.eoan/control
+++ b/admin/linux/debian/debian.eoan/control
@@ -7,10 +7,9 @@ Build-Depends: cmake,
               cdbs,
               dh-python,
               extra-cmake-modules (>= 5.16),
+               kdelibs5-dev,
               libkf5kio-dev,
               libcmocka-dev,
-               libcloudproviders-dev,
-               libdbus-1-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5svg5-dev,
--- a/admin/linux/debian/debian.oldstable/changelog
+++ b/admin/linux/debian/debian.oldstable/changelog
@@ -1,48 +0,0 @@
-nextcloud-client (2.3.3-1.0~oldstable1) oldstable; urgency=medium
-
-  * Debian build support for the forked client.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
-
-nextcloud-client (2.3.1-1.0) oldstable; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
-
-nextcloud-client (2.3.0-1.0) oldstable; urgency=medium
-
-  * New upstream version
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
-
-nextcloud-client (2.2.4-1.4) oldstable; urgency=medium
-
-  * The locale-specific icon names are correct too
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
-
-nextcloud-client (2.2.4-1.3) oldstable; urgency=medium
-
-  * Caja syncstate plugin is built.
-  * The syncstate plugin has application-specific name
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
-
-nextcloud-client (2.2.4-1.2) oldstable; urgency=medium
-
-  * Fixed appname in the Nemo syncstate extension.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
-
-nextcloud-client (2.2.4-1.1) oldstable; urgency=medium
-
-  * Added Nautilus and Nemo syncstate extensions.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
-
-nextcloud-client (2.2.4-1.0) oldstable; urgency=medium
-
-  * Initial release.
-
- -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian.oldstable/control
+++ b/admin/linux/debian/debian.oldstable/control
@@ -1,84 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libdbus-1-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libqt5svg5-dev,
-               libsqlite3-dev,
-               libssl-dev (>= 1.1.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.stable/control
+++ b/admin/linux/debian/debian.stable/control
@@ -9,10 +9,7 @@ Build-Depends: cmake,
               extra-cmake-modules (>= 5.16),
               kdelibs5-dev,
               kio-dev,
-               libavcodec58,
               libcmocka-dev,
-               libcloudproviders-dev,
-               libdbus-1-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5webkit5-dev,
--- a/admin/linux/debian/debian/control
+++ b/admin/linux/debian/debian/control
@@ -10,8 +10,6 @@ Build-Depends: cmake,
               kdelibs5-dev,
               libkf5kio-dev,
               libcmocka-dev,
-               libcloudproviders-dev,
-               libdbus-1-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5svg5-dev,
--- a/admin/linux/debian/drone-build.sh
+++ b/admin/linux/debian/drone-build.sh
@@ -51,7 +51,7 @@ if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/n
    origsourceopt="-sa"
 fi

-for distribution in xenial bionic disco eoan stable oldstable; do
+for distribution in xenial bionic disco eoan stable; do
    rm -rf nextcloud-client_${basever}
    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}

@@ -98,46 +98,26 @@ if test "${pull_request}" = "master"; then
        PPA=$PPA_BETA
        OBS_PROJECT=$OBS_PROJECT_BETA
    fi
+    OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"

    if test -f ~/.has_ppa_keys; then
        for changes in nextcloud-client_*~+([a-z])1_source.changes; do
-            case "${changes}" in
-                *oldstable1*)
-                    ;;
-                *)
-                    dput $PPA $changes > /dev/null
-                    ;;
-            esac
+            dput $PPA $changes > /dev/null
        done

-        for distribution in stable oldstable; do
-            if test "${distribution}" = "oldstable"; then
-                pkgsuffix=".${distribution}"
-                pkgvertag="~${distribution}1"
-            else
-                pkgsuffix=""
-                pkgvertag=""
-            fi
+        mkdir osc
+        cd osc
+        osc co ${OBS_PROJECT} ${OBS_PACKAGE}
+        if test "$(ls ${OBS_SUBDIR})"; then
+            osc delete ${OBS_SUBDIR}/*
+        fi
+        cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
+        cp ../nextcloud-client_*[0-9.][0-9].dsc ${OBS_SUBDIR}/
+        cp ../nextcloud-client_*[0-9.][0-9].debian.tar* ${OBS_SUBDIR}/
+        cp ../nextcloud-client_*[0-9.][0-9]_source.changes ${OBS_SUBDIR}/
+        osc add ${OBS_SUBDIR}/*

-            package="${OBS_PACKAGE}${pkgsuffix}"
-            OBS_SUBDIR="${OBS_PROJECT}/${package}"
-
-            mkdir -p osc
-            pushd osc
-            osc co ${OBS_PROJECT} ${package}
-            if test "$(ls ${OBS_SUBDIR})"; then
-                osc delete ${OBS_SUBDIR}/*
-            fi
-
-            cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
-            cp ../nextcloud-client_*[0-9.][0-9]${pkgvertag}.dsc ${OBS_SUBDIR}/
-            cp ../nextcloud-client_*[0-9.][0-9]${pkgvertag}.debian.tar* ${OBS_SUBDIR}/
-            cp ../nextcloud-client_*[0-9.][0-9]${pkgvertag}_source.changes ${OBS_SUBDIR}/
-            osc add ${OBS_SUBDIR}/*
-
-            cd ${OBS_SUBDIR}
-            osc commit -m "Travis update"
-            popd
-        done
+        cd ${OBS_SUBDIR}
+        osc commit -m "Travis update"
    fi
 fi
--- a/admin/linux/upload-appimage.sh
+++ b/admin/linux/upload-appimage.sh
@@ -1,21 +0,0 @@
-#! /bin/bash
-
-set -xe
-
-cd /build
-
-# Upload AppImage
-APPIMAGE=$(readlink -f ./Nextcloud*.AppImage)
-BASENAME=$(basename ${APPIMAGE})
-
-if curl --max-time 900 --upload-file ${APPIMAGE} https://transfer.sh/${BASENAME}
-then
-    echo
-    echo "Get the AppImage at the link above!"
-else
-    echo
-    echo "Upload failed, however this is an optional step."
-fi
-
-# Don't let the Drone build fail
-exit 0
--- a/admin/osx/create_mac.sh.cmake
+++ b/admin/osx/create_mac.sh.cmake
@@ -49,7 +49,7 @@ fi
 if [ ! -z "$identity" ]; then
 	echo "Will try to sign the installer"
 	pushd $install_path
-	productsign --timestamp --sign "$identity" "$installer_file" "$installer_file.new"
+	productsign --sign "$identity" "$installer_file" "$installer_file.new"
 	mv "$installer_file".new "$installer_file"
 	popd
 else
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -32,12 +32,11 @@ FRAMEWORK_SEARCH_PATH=[
    os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]

-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Qt-5.12.5/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Qt-5.6.2/lib', '.']

 QT_PLUGINS = [
    'sqldrivers/libqsqlite.dylib',
    'platforms/libqcocoa.dylib',
-    'styles/libqmacstyle.dylib',
    'imageformats/libqgif.dylib',
    'imageformats/libqico.dylib',
    'imageformats/libqjpeg.dylib',
@@ -47,7 +46,7 @@ QT_PLUGINS = [
 QT_PLUGINS_SEARCH_PATH=[
 #    os.path.join(os.environ['QTDIR'], 'plugins'),
 #    '/usr/local/Cellar/qt/5.2.1/plugins',
-    '/usr/local/Qt-5.12.5/plugins',
+    '/usr/local/Qt-5.6.2/plugins',
 ]


--- a/admin/win/nsi/installer.ico
+++ b/admin/win/nsi/installer.ico
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/admin/win/nsi/welcome.bmp
+++ b/admin/win/nsi/welcome.bmp
--- a/2
+++ b/2
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -27,7 +27,7 @@
        <key>CFBundleShortVersionString</key>
        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2019 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
        <key>NSSupportsAutomaticGraphicsSwitching</key>
        <true/>
        <key>SUShowReleaseNotes</key>
--- a/cmake/modules/Warnings.cmake
+++ b/cmake/modules/Warnings.cmake
@@ -3,11 +3,7 @@
 # For details see the accompanying COPYING* file.

 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-
-    # Use this only for Clang
-    if (CMAKE_CXX_COMPILER MATCHES "Clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long -Wno-gnu-zero-variadic-macro-arguments")
-    endif()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long -Wno-gnu-zero-variadic-macro-arguments")

    # Fix sqlite compilation on macOS
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types-discards-qualifiers")
--- a/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj
@@ -467,7 +467,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = FinderSyncExt/FinderSyncExt.entitlements;
 				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
--- a/shell_integration/dolphin/ownclouddolphinpluginhelper.h
+++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.h
@@ -35,11 +35,11 @@ public:

    QString contextMenuTitle() const
    {
-        return _strings.value("CONTEXT_MENU_TITLE", "Nextcloud");
+        return _strings.value("CONTEXT_MENU_TITLE", "ownCloud");
    }
    QString shareActionTitle() const
    {
-        return _strings.value("SHARE_MENU_TITLE", "Share …");
+        return _strings.value("SHARE_MENU_TITLE", "Share...");
    }

    QString copyPrivateLinkTitle() const { return _strings["COPY_PRIVATE_LINK_MENU_TITLE"]; }
--- a/shell_integration/windows/OCContextMenu/OCContextMenu.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenu.cpp
@@ -89,7 +89,7 @@ IFACEMETHODIMP OCContextMenu::Initialize(
        HDROP hDrop = static_cast<HDROP>(GlobalLock(stm.hGlobal));
        if (hDrop) {
            UINT nFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
-            for (UINT i = 0; i < nFiles; ++i) {
+            for (int i = 0; i < nFiles; ++i) {
                // Get the path of the file.
                wchar_t buffer[MAX_PATH];

--- a/shell_integration/windows/OCContextMenu/targetver.h
+++ b/shell_integration/windows/OCContextMenu/targetver.h
@@ -5,8 +5,6 @@
 // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
 // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.

-// Note: Here was a #define for windows target version
-// e.g. WINVER / _WIN32_WINNT, see https://devblogs.microsoft.com/oldnewthing/20070411-00/?p=27283
-// Unnecessary because we define both in desktop/CMakeLists.txt
-
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501
 #include <SDKDDKVer.h>
--- a/shell_integration/windows/OCOverlays/stdafx.h
+++ b/shell_integration/windows/OCOverlays/stdafx.h
@@ -13,10 +13,8 @@
 */

 #define WIN32_LEAN_AND_MEAN
-
-// Note: Here was a #define for windows target version
-// e.g. WINVER / _WIN32_WINNT, see https://devblogs.microsoft.com/oldnewthing/20070411-00/?p=27283
-// Unnecessary because we define both in desktop/CMakeLists.txt
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501

 #include "CommunicationSocket.h"
 #include "RegistryUtil.h"
--- a/shell_integration/windows/OCUtil/stdafx.h
+++ b/shell_integration/windows/OCUtil/stdafx.h
@@ -1,9 +1,7 @@
 #pragma once

 #define WIN32_LEAN_AND_MEAN
-
-// Note: Here was a #define for windows target version
-// e.g. WINVER / _WIN32_WINNT, see https://devblogs.microsoft.com/oldnewthing/20070411-00/?p=27283
-// Unnecessary because we define both in desktop/CMakeLists.txt
+#define WINVER 0x0501
+#define _WIN32_WINNT 0x0501

 #include <windows.h>
--- a/src/3rdparty/libcrashreporter-qt
+++ b/src/3rdparty/libcrashreporter-qt
--- a/src/3rdparty/qtmacgoodies
+++ b/src/3rdparty/qtmacgoodies
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,17 +29,12 @@ if(NOT MSVC)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
  endif()
-
-  # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
-  # extension (C++11 §16.3/4 forbids them). Silence clang's warnings.
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
 endif()

 if(WIN32)
  # Enable DEP & ASLR
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /nxcompat /dynamicbase")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /nxcompat /dynamicbase")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
 elseif(UNIX AND NOT APPLE)
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
--- a/src/common/asserts.h
+++ b/src/common/asserts.h
@@ -11,50 +11,43 @@

 // For overloading macros by argument count
 // See stackoverflow.com/questions/16683146/can-macros-be-overloaded-by-number-of-arguments
-// Bugfix 08/09/2019: Broken arg expansion led to always collapsing to 1 arg (XXXX_1 overload result)
-// See also: https://stackoverflow.com/questions/9183993/msvc-variadic-macro-expansion
-#define OC_ASSERT_GLUE(x, y) x y
-
+#define OC_ASSERT_CAT(A, B) A##B
+#define OC_ASSERT_SELECT(NAME, NUM) OC_ASSERT_CAT(NAME##_, NUM)
 #define OC_ASSERT_GET_COUNT(_1, _2, _3, COUNT, ...) COUNT
-#define OC_ASSERT_EXPAND_ARGS(args) OC_ASSERT_GET_COUNT args
-#define OC_ASSERT_VA_SIZE(...) OC_ASSERT_EXPAND_ARGS((__VA_ARGS__, 3, 2, 1, 0))
+#define OC_ASSERT_VA_SIZE(...) OC_ASSERT_GET_COUNT(__VA_ARGS__, 3, 2, 1, 0)

-#define OC_ASSERT_SELECT2(NAME, COUNT) NAME##COUNT
-#define OC_ASSERT_SELECT1(NAME, COUNT) OC_ASSERT_SELECT2(NAME, COUNT)
-#define OC_ASSERT_SELECT(NAME, COUNT) OC_ASSERT_SELECT1(NAME, COUNT)
-
-#define OC_ASSERT_OVERLOAD(NAME, ...) OC_ASSERT_GLUE(OC_ASSERT_SELECT(NAME, OC_ASSERT_VA_SIZE(__VA_ARGS__)), \
-    (__VA_ARGS__))
+#define OC_ASSERT_OVERLOAD(NAME, ...) OC_ASSERT_SELECT(NAME, OC_ASSERT_VA_SIZE(__VA_ARGS__)) \
+    (__VA_ARGS__)

 // Default assert: If the condition is false in debug builds, terminate.
 //
 // Prints a message on failure, even in release builds.
-#define ASSERT1(cond)                                                                  \
+#define ASSERT(...) OC_ASSERT_OVERLOAD(ASSERT, __VA_ARGS__)
+#define ASSERT_1(cond)                                                                  \
    if (!(cond)) {                                                                      \
        OC_ASSERT_MSG("ASSERT: \"%s\" in file %s, line %d", #cond, __FILE__, __LINE__); \
    } else {                                                                            \
    }
-#define ASSERT2(cond, message)                                                                                   \
+#define ASSERT_2(cond, message)                                                                                   \
    if (!(cond)) {                                                                                                \
        OC_ASSERT_MSG("ASSERT: \"%s\" in file %s, line %d with message: %s", #cond, __FILE__, __LINE__, message); \
    } else {                                                                                                      \
    }
-#define ASSERT(...) OC_ASSERT_OVERLOAD(ASSERT, __VA_ARGS__)

 // Enforce condition to be true, even in release builds.
 //
 // Prints 'message' and aborts execution if 'cond' is false.
-#define ENFORCE1(cond)                                                           \
+#define ENFORCE(...) OC_ASSERT_OVERLOAD(ENFORCE, __VA_ARGS__)
+#define ENFORCE_1(cond)                                                           \
    if (!(cond)) {                                                                \
        qFatal("ENFORCE: \"%s\" in file %s, line %d", #cond, __FILE__, __LINE__); \
    } else {                                                                      \
    }
-#define ENFORCE2(cond, message)                                                                            \
+#define ENFORCE_2(cond, message)                                                                            \
    if (!(cond)) {                                                                                          \
        qFatal("ENFORCE: \"%s\" in file %s, line %d with message: %s", #cond, __FILE__, __LINE__, message); \
    } else {                                                                                                \
    }
-#define ENFORCE(...) OC_ASSERT_OVERLOAD(ENFORCE, __VA_ARGS__)

 // An assert that is only present in debug builds: typically used for
 // asserts that are too expensive for release mode.
--- a/src/common/c_jhash.h
+++ b/src/common/c_jhash.h
@@ -207,10 +207,7 @@ static inline uint64_t c_jhash64(const uint8_t *k, uint64_t length, uint64_t int
  /* handle the last 23 bytes */
  c += length;
  switch(len) {
-// pragma only for GCC (and clang continues to pretend to be it by defining __GNUC__)
-#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#endif
    case 23: c+=((uint64_t)k[22]<<56);
    case 22: c+=((uint64_t)k[21]<<48);
    case 21: c+=((uint64_t)k[20]<<40);
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -281,8 +281,8 @@ int SqlQuery::prepare(const QByteArray &sql, bool allow_failure)
 */
 static bool startsWithInsensitive(const QByteArray &a, const char *b)
 {
-    size_t len = strlen(b);
-    return a.size() >= len && qstrnicmp(a.constData(), b, Utility::convertSizeToUint(len)) == 0;
+    int len = strlen(b);
+    return a.size() >= len && qstrnicmp(a.constData(), b, len) == 0;
 }

 bool SqlQuery::isSelect()
--- a/src/common/syncjournaldb.h
+++ b/src/common/syncjournaldb.h
@@ -103,7 +103,6 @@ public:
            : _chunk(0)
            , _transferid(0)
            , _size(0)
-            , _modtime(0)
            , _errorCount(0)
            , _valid(false)
        {
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -396,26 +396,6 @@ void Utility::crash()
    *a = 1;
 }

-// Use this functions to retrieve uint/int (often required by Qt and WIN32) from size_t
-// without compiler warnings about possible truncation
-uint Utility::convertSizeToUint(size_t &convertVar)
-{
-    if( convertVar > UINT_MAX ) {
-        //throw std::bad_cast();
-        convertVar = UINT_MAX; // intentionally default to wrong value here to not crash: exception handling TBD
-    }
-    return static_cast<uint>(convertVar);
-}
-
-uint Utility::convertSizeToInt(size_t &convertVar)
-{
-    if( convertVar > INT_MAX ) {
-        //throw std::bad_cast();
-        convertVar = INT_MAX; // intentionally default to wrong value here to not crash: exception handling TBD
-    }
-    return static_cast<int>(convertVar);
-}
-
 // read the output of the owncloud --version command from the owncloud
 // version that is on disk. This works for most versions of the client,
 // because clients that do not yet know the --version flag return the
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -55,12 +55,6 @@ namespace Utility {
    OCSYNC_EXPORT QByteArray userAgentString();
    OCSYNC_EXPORT bool hasLaunchOnStartup(const QString &appName);
    OCSYNC_EXPORT void setLaunchOnStartup(const QString &appName, const QString &guiName, bool launch);
-    OCSYNC_EXPORT uint convertSizeToUint(size_t &convertVar);
-    OCSYNC_EXPORT uint convertSizeToInt(size_t &convertVar);
-
-#ifdef Q_OS_WIN
-    OCSYNC_EXPORT DWORD convertSizeToDWORD(size_t &convertVar);
-#endif

    /**
     * Return the amount of free space available.
--- a/src/common/utility_win.cpp
+++ b/src/common/utility_win.cpp
@@ -90,13 +90,32 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
 // TODO: Right now only detection on toggle/startup, not when windows theme is switched while nextcloud is running
 static inline bool hasDarkSystray_private()
 {
-    if(Utility::registryGetKeyValue(    HKEY_CURRENT_USER,
-                                        "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
-                                        "SystemUsesLightTheme" ) == 1) {
-        return false;
-    }
-    else {
-        return true;
+    bool hasDarkSystray = true;
+    // Open registry key first, continue only on success (may be legitimately absent in earlier windows versions)
+    HKEY hKey;
+    LONG lRes = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", 0, KEY_READ, &hKey);
+    
+    // classical windows function - preserve buff size for DWORD, call ExW version, store regkey value in nResult
+    if (lRes == ERROR_SUCCESS) {
+        DWORD dwBufferSize(sizeof(DWORD));
+        DWORD nResult(0);
+
+        // https://docs.microsoft.com/en-us/windows/win32/api/winreg/nf-winreg-regqueryvalueexw
+        LONG nError = ::RegQueryValueExW(hKey,
+            L"SystemUsesLightTheme",
+            NULL,
+            NULL,
+            reinterpret_cast<LPBYTE>(&nResult),
+            &dwBufferSize);
+        
+        // if RegQuery returned no error and light theme was found, change systray return value
+        if (nError == ERROR_SUCCESS && nResult == 1)
+            hasDarkSystray = false;
+
+        return hasDarkSystray;
+    } else {
+        // fallback to true if regkey could not be determined
+        return hasDarkSystray;
    }
 }

@@ -264,13 +283,4 @@ bool Utility::registryWalkSubKeys(HKEY hRootKey, const QString &subKey, const st
    return retCode != ERROR_NO_MORE_ITEMS;
 }

-DWORD Utility::convertSizeToDWORD(size_t &convertVar)
-{
-    if( convertVar > UINT_MAX ) {
-        //throw std::bad_cast();
-        convertVar = UINT_MAX; // intentionally default to wrong value here to not crash: exception handling TBD
-    }
-    return static_cast<DWORD>(convertVar);
-}
-
 } // namespace OCC
--- a/src/csync/csync_exclude.cpp
+++ b/src/csync/csync_exclude.cpp
@@ -73,7 +73,7 @@ static void csync_exclude_expand_escapes(QByteArray &input)
            line[o++] = line[i];
        }
    }
-    input.resize(OCC::Utility::convertSizeToUint(o));
+    input.resize(o);
 }

 // See http://support.microsoft.com/kb/74496 and
@@ -288,11 +288,7 @@ void ExcludedFiles::addManualExclude(const QByteArray &expr)

 void ExcludedFiles::addManualExclude(const QByteArray &expr, const QByteArray &basePath)
 {
-#if defined(Q_OS_WIN)
-    Q_ASSERT(basePath.size() >= 2 && basePath.at(1) == ':');
-#else
    Q_ASSERT(basePath.startsWith('/'));
-#endif
    Q_ASSERT(basePath.endsWith('/'));

    auto key = basePath;
@@ -326,11 +322,7 @@ bool ExcludedFiles::loadExcludeFile(const QByteArray & basePath, const QString &
        csync_exclude_expand_escapes(line);
        _allExcludes[basePath].append(line);
    }
-
-    // nothing to prepare if the user decided to not exclude anything
-    if(_allExcludes.size())
-        prepare(basePath);
-
+    prepare(basePath);
    return true;
 }

@@ -346,8 +338,8 @@ bool ExcludedFiles::reloadExcludeFiles()
    _fullRegexDir.clear();

    bool success = true;
-    for (const auto& basePath : _excludeFiles.keys()) {
-        for (const auto& file : _excludeFiles.value(basePath)) {
+    for (auto basePath : _excludeFiles.keys()) {
+        for (auto file : _excludeFiles.value(basePath)) {
            success = loadExcludeFile(basePath, file);
        }
    }
--- a/src/csync/csync_update.cpp
+++ b/src/csync/csync_update.cpp
@@ -724,8 +724,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
    if (ctx->current == LOCAL_REPLICA) {
        ASSERT(dirent->path.startsWith(ctx->local.uri)); // path is relative to uri
        // "len + 1" to include the slash in-between.
-        size_t uriLength = strlen(ctx->local.uri);
-        dirent->path = dirent->path.mid(OCC::Utility::convertSizeToInt(uriLength) + 1);
+        dirent->path = dirent->path.mid(strlen(ctx->local.uri) + 1);
    }

    previous_fs = ctx->current_fs;
--- a/src/csync/std/c_utf8.cpp
+++ b/src/csync/std/c_utf8.cpp
@@ -38,7 +38,6 @@
 #include "c_alloc.h"
 #include "c_string.h"
 #include "common/filesystembase.h"
-#include "common/utility.h"

 /* Convert a locale String to UTF8 */
 QByteArray c_utf8_from_locale(const mbchar_t *wstr)
@@ -53,10 +52,10 @@ QByteArray c_utf8_from_locale(const mbchar_t *wstr)
  size_t len;
  len = wcslen(wstr);
  /* Call once to get the required size. */
-  size_needed = WideCharToMultiByte(CP_UTF8, 0, wstr, OCC::Utility::convertSizeToInt(len), NULL, 0, NULL, NULL);
+  size_needed = WideCharToMultiByte(CP_UTF8, 0, wstr, len, NULL, 0, NULL, NULL);
  if (size_needed > 0) {
    dst.resize(size_needed);
-    WideCharToMultiByte(CP_UTF8, 0, wstr, OCC::Utility::convertSizeToInt(len), dst.data(), size_needed, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, wstr, len, dst.data(), size_needed, NULL, NULL);
  }
  return dst;
 #else
@@ -96,7 +95,7 @@ mbchar_t* c_utf8_string_to_locale(const char *str)
    int size_needed;

    len = strlen(str);
-    size_needed = MultiByteToWideChar(CP_UTF8, 0, str, OCC::Utility::convertSizeToInt(len), NULL, 0);
+    size_needed = MultiByteToWideChar(CP_UTF8, 0, str, len, NULL, 0);
    if (size_needed > 0) {
        int size_char = (size_needed + 1) * sizeof(mbchar_t);
        dst = (mbchar_t*)c_malloc(size_char);
@@ -115,8 +114,7 @@ mbchar_t* c_utf8_string_to_locale(const char *str)
         return NULL;
     } else {
 #ifdef _WIN32
-         size_t strLength = strlen(str);
-         QByteArray unc_str = OCC::FileSystem::pathtoUNC(QByteArray::fromRawData(str, OCC::Utility::convertSizeToInt(strLength)));
+         QByteArray unc_str = OCC::FileSystem::pathtoUNC(QByteArray::fromRawData(str, strlen(str)));
         mbchar_t *dst = c_utf8_string_to_locale(unc_str);
         return dst;
 #else
--- a/src/csync/vio/csync_vio_local_win.cpp
+++ b/src/csync/vio/csync_vio_local_win.cpp
@@ -57,7 +57,7 @@ csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
  handle = (dhandle_t*)c_malloc(sizeof(dhandle_t));

  // the file wildcard has to be attached
-  size_t len_name = strlen(name);
+  int len_name = strlen(name);
  if( len_name ) {
      char *h = NULL;

--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -35,11 +35,12 @@ set(client_UI_SRCS
    addcertificatedialog.ui
    proxyauthdialog.ui
    mnemonicdialog.ui
-    wizard/flow2authwidget.ui
    wizard/owncloudadvancedsetuppage.ui
    wizard/owncloudconnectionmethoddialog.ui
    wizard/owncloudhttpcredspage.ui
    wizard/owncloudoauthcredspage.ui
+    wizard/flow2authcredspage.ui
+    wizard/flow2authwidget.ui
    wizard/owncloudsetupnocredspage.ui
    wizard/owncloudwizardresultpage.ui
    wizard/webview.ui
@@ -102,14 +103,11 @@ set(client_SRCS
    servernotificationhandler.cpp
    guiutility.cpp
    elidedlabel.cpp
-    headerbanner.cpp
    iconjob.cpp
-    remotewipe.cpp
    creds/credentialsfactory.cpp
    creds/httpcredentialsgui.cpp
    creds/oauth.cpp
    creds/flow2auth.cpp
-    creds/keychainchunk.cpp
    creds/webflowcredentials.cpp
    creds/webflowcredentialsdialog.cpp
    wizard/postfixlineedit.cpp
@@ -146,6 +144,8 @@ set(updater_SRCS

 IF( APPLE )
    list(APPEND client_SRCS cocoainitializer_mac.mm)
+    list(APPEND client_SRCS settingsdialogmac.cpp)
+    list(REMOVE_ITEM client_SRCS settingsdialog.cpp)
    list(APPEND client_SRCS socketapisocket_mac.mm)
    list(APPEND client_SRCS systray.mm)

@@ -175,6 +175,14 @@ set(3rdparty_SRC
    ../3rdparty/kmessagewidget/kmessagewidget.cpp
   )

+if (APPLE)
+    list(APPEND 3rdparty_SRC
+        ../3rdparty/qtmacgoodies/src/macpreferenceswindow.mm
+        ../3rdparty/qtmacgoodies/src/macstandardicon.mm
+        ../3rdparty/qtmacgoodies/src/macwindow.mm
+        )
+endif()
+
 if(NOT WIN32)
   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
 else()
@@ -330,6 +338,7 @@ ENDIF()
 target_include_directories(${APPLICATION_EXECUTABLE} PRIVATE
    ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src
    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
    ${CMAKE_SOURCE_DIR}/src/3rdparty/kmessagewidget
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -368,7 +368,6 @@ void AccountManager::shutdown()
    _accounts.clear();
    foreach (const auto &acc, accountsCopy) {
        emit accountRemoved(acc.data());
-        emit removeAccountFolders(acc.data());
    }
 }

--- a/src/gui/accountmanager.h
+++ b/src/gui/accountmanager.h
@@ -70,6 +70,7 @@ public:
     */
    void deleteAccount(AccountState *account);

+
    /**
     * Creates an account and sets up some basic handlers.
     * Does *not* add the account to the account manager just yet.
@@ -103,7 +104,6 @@ public slots:
 Q_SIGNALS:
    void accountAdded(AccountState *account);
    void accountRemoved(AccountState *account);
-    void removeAccountFolders(AccountState *account);

 private:
    AccountManager() {}
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -57,6 +57,10 @@

 #include "account.h"

+#ifdef Q_OS_MAC
+#include "settingsdialogmac.h"
+#endif
+
 namespace OCC {

 Q_LOGGING_CATEGORY(lcAccountSettings, "nextcloud.gui.account.settings", QtInfoMsg)
@@ -109,13 +113,13 @@ protected:

 AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
    : QWidget(parent)
-    , _ui(new Ui::AccountSettings)
+    , ui(new Ui::AccountSettings)
    , _wasDisabledBefore(false)
    , _accountState(accountState)
    , _quotaInfo(accountState)
    , _menuShown(false)
 {
-    _ui->setupUi(this);
+    ui->setupUi(this);

    _model = new FolderStatusModel;
    _model->setAccountState(_accountState);
@@ -123,40 +127,35 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
    FolderStatusDelegate *delegate = new FolderStatusDelegate;
    delegate->setParent(this);

-    // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
-    connect(this, &AccountSettings::styleChanged, delegate, &FolderStatusDelegate::slotStyleChanged);
-
-    _ui->_folderList->header()->hide();
-    _ui->_folderList->setItemDelegate(delegate);
-    _ui->_folderList->setModel(_model);
+    ui->_folderList->header()->hide();
+    ui->_folderList->setItemDelegate(delegate);
+    ui->_folderList->setModel(_model);
 #if defined(Q_OS_MAC)
-    _ui->_folderList->setMinimumWidth(400);
+    ui->_folderList->setMinimumWidth(400);
 #else
-    _ui->_folderList->setMinimumWidth(300);
+    ui->_folderList->setMinimumWidth(300);
 #endif
-    new ToolTipUpdater(_ui->_folderList);
+    new ToolTipUpdater(ui->_folderList);

    auto mouseCursorChanger = new MouseCursorChanger(this);
-    mouseCursorChanger->folderList = _ui->_folderList;
+    mouseCursorChanger->folderList = ui->_folderList;
    mouseCursorChanger->model = _model;
-    _ui->_folderList->setMouseTracking(true);
-    _ui->_folderList->setAttribute(Qt::WA_Hover, true);
-    _ui->_folderList->installEventFilter(mouseCursorChanger);
+    ui->_folderList->setMouseTracking(true);
+    ui->_folderList->setAttribute(Qt::WA_Hover, true);
+    ui->_folderList->installEventFilter(mouseCursorChanger);

    createAccountToolbox();
    connect(AccountManager::instance(), &AccountManager::accountAdded,
        this, &AccountSettings::slotAccountAdded);
-    connect(this, &AccountSettings::removeAccountFolders,
-            AccountManager::instance(), &AccountManager::removeAccountFolders);
-    connect(_ui->_folderList, &QWidget::customContextMenuRequested,
+    connect(ui->_folderList, &QWidget::customContextMenuRequested,
        this, &AccountSettings::slotCustomContextMenuRequested);
-    connect(_ui->_folderList, &QAbstractItemView::clicked,
+    connect(ui->_folderList, &QAbstractItemView::clicked,
        this, &AccountSettings::slotFolderListClicked);
-    connect(_ui->_folderList, &QTreeView::expanded, this, &AccountSettings::refreshSelectiveSyncStatus);
-    connect(_ui->_folderList, &QTreeView::collapsed, this, &AccountSettings::refreshSelectiveSyncStatus);
-    connect(_ui->selectiveSyncNotification, &QLabel::linkActivated,
+    connect(ui->_folderList, &QTreeView::expanded, this, &AccountSettings::refreshSelectiveSyncStatus);
+    connect(ui->_folderList, &QTreeView::collapsed, this, &AccountSettings::refreshSelectiveSyncStatus);
+    connect(ui->selectiveSyncNotification, &QLabel::linkActivated,
        this, &AccountSettings::slotLinkActivated);
-    connect(_model, &FolderStatusModel::suggestExpand, _ui->_folderList, &QTreeView::expand);
+    connect(_model, &FolderStatusModel::suggestExpand, ui->_folderList, &QTreeView::expand);
    connect(_model, &FolderStatusModel::dirtyChanged, this, &AccountSettings::refreshSelectiveSyncStatus);
    refreshSelectiveSyncStatus();
    connect(_model, &QAbstractItemModel::rowsInserted,
@@ -173,21 +172,20 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
    addAction(syncNowWithRemoteDiscovery);


-    connect(_ui->selectiveSyncApply, &QAbstractButton::clicked, _model, &FolderStatusModel::slotApplySelectiveSync);
-    connect(_ui->selectiveSyncCancel, &QAbstractButton::clicked, _model, &FolderStatusModel::resetFolders);
-    connect(_ui->bigFolderApply, &QAbstractButton::clicked, _model, &FolderStatusModel::slotApplySelectiveSync);
-    connect(_ui->bigFolderSyncAll, &QAbstractButton::clicked, _model, &FolderStatusModel::slotSyncAllPendingBigFolders);
-    connect(_ui->bigFolderSyncNone, &QAbstractButton::clicked, _model, &FolderStatusModel::slotSyncNoPendingBigFolders);
+    connect(ui->selectiveSyncApply, &QAbstractButton::clicked, _model, &FolderStatusModel::slotApplySelectiveSync);
+    connect(ui->selectiveSyncCancel, &QAbstractButton::clicked, _model, &FolderStatusModel::resetFolders);
+    connect(ui->bigFolderApply, &QAbstractButton::clicked, _model, &FolderStatusModel::slotApplySelectiveSync);
+    connect(ui->bigFolderSyncAll, &QAbstractButton::clicked, _model, &FolderStatusModel::slotSyncAllPendingBigFolders);
+    connect(ui->bigFolderSyncNone, &QAbstractButton::clicked, _model, &FolderStatusModel::slotSyncNoPendingBigFolders);

    connect(FolderMan::instance(), &FolderMan::folderListChanged, _model, &FolderStatusModel::resetFolders);
    connect(this, &AccountSettings::folderChanged, _model, &FolderStatusModel::resetFolders);


-    // quotaProgressBar style now set in customizeStyle()
-    /*QColor color = palette().highlight().color();
-     _ui->quotaProgressBar->setStyleSheet(QString::fromLatin1(progressBarStyleC).arg(color.name()));*/
+    QColor color = palette().highlight().color();
+    ui->quotaProgressBar->setStyleSheet(QString::fromLatin1(progressBarStyleC).arg(color.name()));

-    _ui->connectLabel->setText(tr("No account configured."));
+    ui->connectLabel->setText(tr("No account configured."));

    connect(_accountState, &AccountState::stateChanged, this, &AccountSettings::slotAccountStateChanged);
    slotAccountStateChanged();
@@ -204,10 +202,8 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
    {
        slotNewMnemonicGenerated();
    } else {
-        _ui->encryptionMessage->hide();
+        ui->encryptionMessage->hide();
    }
-
-    customizeStyle();
 }


@@ -229,9 +225,9 @@ void AccountSettings::createAccountToolbox()
    menu->addAction(action);
    connect(action, &QAction::triggered, this, &AccountSettings::slotDeleteAccount);

-    _ui->_accountToolbox->setText(tr("Account") + QLatin1Char(' '));
-    _ui->_accountToolbox->setMenu(menu);
-    _ui->_accountToolbox->setPopupMode(QToolButton::InstantPopup);
+    ui->_accountToolbox->setText(tr("Account") + QLatin1Char(' '));
+    ui->_accountToolbox->setMenu(menu);
+    ui->_accountToolbox->setPopupMode(QToolButton::InstantPopup);

    slotAccountAdded(_accountState);
 }
@@ -239,14 +235,14 @@ void AccountSettings::createAccountToolbox()

 void AccountSettings::slotNewMnemonicGenerated()
 {
-    _ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
+    ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));

    QAction *mnemonic = new QAction(tr("Enable encryption"), this);
    connect(mnemonic, &QAction::triggered, this, &AccountSettings::requesetMnemonic);
-    connect(mnemonic, &QAction::triggered, _ui->encryptionMessage, &KMessageWidget::hide);
+    connect(mnemonic, &QAction::triggered, ui->encryptionMessage, &KMessageWidget::hide);

-    _ui->encryptionMessage->addAction(mnemonic);
-    _ui->encryptionMessage->show();
+    ui->encryptionMessage->addAction(mnemonic);
+    ui->encryptionMessage->show();
 }

 void AccountSettings::slotMenuBeforeShow() {
@@ -254,7 +250,7 @@ void AccountSettings::slotMenuBeforeShow() {
        return;
    }

-    auto menu = _ui->_accountToolbox->menu();
+    auto menu = ui->_accountToolbox->menu();

    // We can't check this during the initial creation as there is no account yet then
    if (_accountState->account()->capabilities().clientSideEncryptionAvaliable()) {
@@ -269,7 +265,7 @@ void AccountSettings::slotMenuBeforeShow() {

 QString AccountSettings::selectedFolderAlias() const
 {
-    QModelIndex selected = _ui->_folderList->selectionModel()->currentIndex();
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
    if (!selected.isValid())
        return "";
    return _model->data(selected, FolderStatusDelegate::FolderAliasRole).toString();
@@ -282,7 +278,16 @@ void AccountSettings::slotOpenAccountWizard()
    if (qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" || QSystemTrayIcon::isSystemTrayAvailable()) {
        topLevelWidget()->close();
    }
+#ifdef Q_OS_MAC
+    qCDebug(lcAccountSettings) << parent() << topLevelWidget();
+    SettingsDialogMac *sd = qobject_cast<SettingsDialogMac *>(topLevelWidget());

+    if (sd) {
+        sd->showActivityPage();
+    } else {
+        qFatal("nope");
+    }
+#endif
    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), nullptr);
 }

@@ -298,7 +303,7 @@ void AccountSettings::slotToggleSignInState()

 void AccountSettings::doExpand()
 {
-    _ui->_folderList->expandToDepth(0);
+    ui->_folderList->expandToDepth(0);
 }

 void AccountSettings::slotShowMnemonic(const QString &mnemonic) {
@@ -329,9 +334,9 @@ void AccountSettings::slotEncryptionFlagError(const QByteArray& fileId, int http

 void AccountSettings::slotLockForEncryptionSuccess(const QByteArray& fileId, const QByteArray &token)
 {
-        accountsState()->account()->e2e()->setTokenForFolder(fileId, token);
+		accountsState()->account()->e2e()->setTokenForFolder(fileId, token);

-        FolderMetadata emptyMetadata(accountsState()->account());
+		FolderMetadata emptyMetadata(accountsState()->account());
    auto encryptedMetadata = emptyMetadata.encryptedMetadata();
    if (encryptedMetadata.isEmpty()) {
      //TODO: Mark the folder as unencrypted as the metadata generation failed.
@@ -343,36 +348,36 @@ void AccountSettings::slotLockForEncryptionSuccess(const QByteArray& fileId, con
      return;
    }
    auto storeMetadataJob = new StoreMetaDataApiJob(accountsState()->account(), fileId, emptyMetadata.encryptedMetadata());
-        connect(storeMetadataJob, &StoreMetaDataApiJob::success,
-                        this, &AccountSettings::slotUploadMetadataSuccess);
-        connect(storeMetadataJob, &StoreMetaDataApiJob::error,
-                        this, &AccountSettings::slotUpdateMetadataError);
+		connect(storeMetadataJob, &StoreMetaDataApiJob::success,
+						this, &AccountSettings::slotUploadMetadataSuccess);
+		connect(storeMetadataJob, &StoreMetaDataApiJob::error,
+						this, &AccountSettings::slotUpdateMetadataError);

-        storeMetadataJob->start();
+		storeMetadataJob->start();
 }

 void AccountSettings::slotUploadMetadataSuccess(const QByteArray& folderId)
 {
-    const auto token = accountsState()->account()->e2e()->tokenForFolder(folderId);
-    auto unlockJob = new UnlockEncryptFolderApiJob(accountsState()->account(), folderId, token);
-    connect(unlockJob, &UnlockEncryptFolderApiJob::success,
-                    this, &AccountSettings::slotUnlockFolderSuccess);
-    connect(unlockJob, &UnlockEncryptFolderApiJob::error,
-                    this, &AccountSettings::slotUnlockFolderError);
-    unlockJob->start();
+	const auto token = accountsState()->account()->e2e()->tokenForFolder(folderId);
+	auto unlockJob = new UnlockEncryptFolderApiJob(accountsState()->account(), folderId, token);
+	connect(unlockJob, &UnlockEncryptFolderApiJob::success,
+					this, &AccountSettings::slotUnlockFolderSuccess);
+	connect(unlockJob, &UnlockEncryptFolderApiJob::error,
+					this, &AccountSettings::slotUnlockFolderError);
+	unlockJob->start();
 }

 void AccountSettings::slotUpdateMetadataError(const QByteArray& folderId, int httpReturnCode)
 {
    Q_UNUSED(httpReturnCode);

-    const auto token = accountsState()->account()->e2e()->tokenForFolder(folderId);
-    auto unlockJob = new UnlockEncryptFolderApiJob(accountsState()->account(), folderId, token);
-    connect(unlockJob, &UnlockEncryptFolderApiJob::success,
-                    this, &AccountSettings::slotUnlockFolderSuccess);
-    connect(unlockJob, &UnlockEncryptFolderApiJob::error,
-                    this, &AccountSettings::slotUnlockFolderError);
-    unlockJob->start();
+	const auto token = accountsState()->account()->e2e()->tokenForFolder(folderId);
+	auto unlockJob = new UnlockEncryptFolderApiJob(accountsState()->account(), folderId, token);
+	connect(unlockJob, &UnlockEncryptFolderApiJob::success,
+					this, &AccountSettings::slotUnlockFolderSuccess);
+	connect(unlockJob, &UnlockEncryptFolderApiJob::error,
+					this, &AccountSettings::slotUnlockFolderError);
+	unlockJob->start();
 }

 void AccountSettings::slotLockForEncryptionError(const QByteArray& fileId, int httpErrorCode)
@@ -546,7 +551,7 @@ void AccountSettings::slotEditCurrentIgnoredFiles()

 void AccountSettings::slotEditCurrentLocalIgnoredFiles()
 {
-    QModelIndex selected = _ui->_folderList->selectionModel()->currentIndex();
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
    if (!selected.isValid() || _model->classify(selected) != FolderStatusModel::SubFolder)
        return;
    QString fileName = _model->data(selected, FolderStatusDelegate::FolderPathRole).toString();
@@ -618,7 +623,7 @@ void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index

 void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
 {
-    QTreeView *tv = _ui->_folderList;
+    QTreeView *tv = ui->_folderList;
    QModelIndex index = tv->indexAt(pos);
    if (!index.isValid()) {
        return;
@@ -649,7 +654,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
    ac = menu->addAction(tr("Edit Ignored Files"));
    connect(ac, &QAction::triggered, this, &AccountSettings::slotEditCurrentIgnoredFiles);

-    if (!_ui->_folderList->isExpanded(index)) {
+    if (!ui->_folderList->isExpanded(index)) {
        ac = menu->addAction(tr("Choose what to sync"));
        ac->setEnabled(folderConnected);
        connect(ac, &QAction::triggered, this, &AccountSettings::doExpand);
@@ -688,7 +693,7 @@ void AccountSettings::slotFolderListClicked(const QModelIndex &indx)
    }
    if (_model->classify(indx) == FolderStatusModel::RootFolder) {
        // tries to find if we clicked on the '...' button.
-        QTreeView *tv = _ui->_folderList;
+        QTreeView *tv = ui->_folderList;
        auto pos = tv->mapFromGlobal(QCursor::pos());
        if (FolderStatusDelegate::optionsButtonRect(tv->visualRect(indx), layoutDirection()).contains(pos)) {
            slotCustomContextMenuRequested(pos);
@@ -701,8 +706,8 @@ void AccountSettings::slotFolderListClicked(const QModelIndex &indx)

        // Expand root items on single click
        if (_accountState && _accountState->state() == AccountState::Connected) {
-            bool expanded = !(_ui->_folderList->isExpanded(indx));
-            _ui->_folderList->setExpanded(indx, expanded);
+            bool expanded = !(ui->_folderList->isExpanded(indx));
+            ui->_folderList->setExpanded(indx, expanded);
        }
    }
 }
@@ -739,7 +744,7 @@ void AccountSettings::slotFolderWizardAccepted()
            qCInfo(lcAccountSettings) << "Creating folder" << definition.localPath;
            if (!dir.mkpath(".")) {
                QMessageBox::warning(this, tr("Folder creation failed"),
-                    tr("<p>Could not create local folder <i>%1</i>.</p>")
+                    tr("<p>Could not create local folder <i>%1</i>.")
                        .arg(QDir::toNativeSeparators(definition.localPath)));
                return;
            }
@@ -784,7 +789,7 @@ void AccountSettings::slotRemoveCurrentFolder()
 {
    FolderMan *folderMan = FolderMan::instance();
    auto folder = folderMan->folder(selectedFolderAlias());
-    QModelIndex selected = _ui->_folderList->selectionModel()->currentIndex();
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
    if (selected.isValid() && folder) {
        int row = selected.row();

@@ -826,7 +831,7 @@ void AccountSettings::slotOpenCurrentFolder()

 void AccountSettings::slotOpenCurrentLocalSubFolder()
 {
-    QModelIndex selected = _ui->_folderList->selectionModel()->currentIndex();
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
    if (!selected.isValid() || _model->classify(selected) != FolderStatusModel::SubFolder)
        return;
    QString fileName = _model->data(selected, FolderStatusDelegate::FolderPathRole).toString();
@@ -840,21 +845,18 @@ void AccountSettings::showConnectionLabel(const QString &message, QStringList er
                                           "border-width: 1px; border-style: solid; border-color: #aaaaaa;"
                                           "border-radius:5px;");
    if (errors.isEmpty()) {
-        QString msg = message;
-        Theme::replaceLinkColorStringBackgroundAware(msg);
-        _ui->connectLabel->setText(msg);
-        _ui->connectLabel->setToolTip(QString());
-        _ui->connectLabel->setStyleSheet(QString());
+        ui->connectLabel->setText(message);
+        ui->connectLabel->setToolTip(QString());
+        ui->connectLabel->setStyleSheet(QString());
    } else {
        errors.prepend(message);
-        QString msg = errors.join(QLatin1String("\n"));
+        const QString msg = errors.join(QLatin1String("\n"));
        qCDebug(lcAccountSettings) << msg;
-        Theme::replaceLinkColorString(msg, QColor("#c1c8e6"));
-        _ui->connectLabel->setText(msg);
-        _ui->connectLabel->setToolTip(QString());
-        _ui->connectLabel->setStyleSheet(errStyle);
+        ui->connectLabel->setText(msg);
+        ui->connectLabel->setToolTip(QString());
+        ui->connectLabel->setStyleSheet(errStyle);
    }
-    _ui->accountStatus->setVisible(!message.isEmpty());
+    ui->accountStatus->setVisible(!message.isEmpty());
 }

 void AccountSettings::slotEnableCurrentFolder()
@@ -952,29 +954,29 @@ void AccountSettings::slotOpenOC()
 void AccountSettings::slotUpdateQuota(qint64 total, qint64 used)
 {
    if (total > 0) {
-        _ui->quotaProgressBar->setVisible(true);
-        _ui->quotaProgressBar->setEnabled(true);
+        ui->quotaProgressBar->setVisible(true);
+        ui->quotaProgressBar->setEnabled(true);
        // workaround the label only accepting ints (which may be only 32 bit wide)
        const double percent = used / (double)total * 100;
        const int percentInt = qMin(qRound(percent), 100);
-        _ui->quotaProgressBar->setValue(percentInt);
+        ui->quotaProgressBar->setValue(percentInt);
        QString usedStr = Utility::octetsToString(used);
        QString totalStr = Utility::octetsToString(total);
        QString percentStr = Utility::compactFormatDouble(percent, 1);
        QString toolTip = tr("%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.").arg(usedStr, totalStr, percentStr);
-        _ui->quotaInfoLabel->setText(tr("%1 of %2 in use").arg(usedStr, totalStr));
-        _ui->quotaInfoLabel->setToolTip(toolTip);
-        _ui->quotaProgressBar->setToolTip(toolTip);
+        ui->quotaInfoLabel->setText(tr("%1 of %2 in use").arg(usedStr, totalStr));
+        ui->quotaInfoLabel->setToolTip(toolTip);
+        ui->quotaProgressBar->setToolTip(toolTip);
    } else {
-        _ui->quotaProgressBar->setVisible(false);
-        _ui->quotaInfoLabel->setToolTip(QString());
+        ui->quotaProgressBar->setVisible(false);
+        ui->quotaInfoLabel->setToolTip(QString());

        /* -1 means not computed; -2 means unknown; -3 means unlimited  (#3940)*/
        if (total == 0 || total == -1) {
-            _ui->quotaInfoLabel->setText(tr("Currently there is no storage usage information available."));
+            ui->quotaInfoLabel->setText(tr("Currently there is no storage usage information available."));
        } else {
            QString usedStr = Utility::octetsToString(used);
-            _ui->quotaInfoLabel->setText(tr("%1 in use").arg(usedStr));
+            ui->quotaInfoLabel->setText(tr("%1 in use").arg(usedStr));
        }
    }
 }
@@ -983,7 +985,7 @@ void AccountSettings::slotAccountStateChanged()
 {
    int state = _accountState ? _accountState->state() : AccountState::Disconnected;
    if (_accountState) {
-        _ui->sslButton->updateAccountState(_accountState);
+        ui->sslButton->updateAccountState(_accountState);
        AccountPtr account = _accountState->account();
        QUrl safeUrl(account->url());
        safeUrl.setPassword(QString()); // Remove the password from the URL to avoid showing it in the UI
@@ -1028,7 +1030,7 @@ void AccountSettings::slotAccountStateChanged()
                                       "<a href='%1'>Click here</a> to re-open the browser.")
                                        .arg(url.toString(QUrl::FullyEncoded)));
            } else {
-                showConnectionLabel(tr("Connecting to %1 …").arg(serverWithUser));
+                showConnectionLabel(tr("Connecting to %1...").arg(serverWithUser));
            }
        } else {
            showConnectionLabel(tr("No connection to %1 at %2.")
@@ -1042,14 +1044,14 @@ void AccountSettings::slotAccountStateChanged()
    }

    /* Allow to expand the item if the account is connected. */
-    _ui->_folderList->setItemsExpandable(state == AccountState::Connected);
+    ui->_folderList->setItemsExpandable(state == AccountState::Connected);

    if (state != AccountState::Connected) {
        /* check if there are expanded root items, if so, close them */
        int i;
        for (i = 0; i < _model->rowCount(); ++i) {
-            if (_ui->_folderList->isExpanded(_model->index(i)))
-                _ui->_folderList->setExpanded(_model->index(i), false);
+            if (ui->_folderList->isExpanded(_model->index(i)))
+                ui->_folderList->setExpanded(_model->index(i), false);
        }
    } else if (_model->isDirty()) {
        // If we connect and have pending changes, show the list.
@@ -1093,21 +1095,21 @@ void AccountSettings::slotLinkActivated(const QString &link)
        // Make sure the folder itself is expanded
        Folder *f = FolderMan::instance()->folder(alias);
        QModelIndex folderIndx = _model->indexForPath(f, QString());
-        if (!_ui->_folderList->isExpanded(folderIndx)) {
-            _ui->_folderList->setExpanded(folderIndx, true);
+        if (!ui->_folderList->isExpanded(folderIndx)) {
+            ui->_folderList->setExpanded(folderIndx, true);
        }

        QModelIndex indx = _model->indexForPath(f, myFolder);
        if (indx.isValid()) {
            // make sure all the parents are expanded
            for (auto i = indx.parent(); i.isValid(); i = i.parent()) {
-                if (!_ui->_folderList->isExpanded(i)) {
-                    _ui->_folderList->setExpanded(i, true);
+                if (!ui->_folderList->isExpanded(i)) {
+                    ui->_folderList->setExpanded(i, true);
                }
            }
-            _ui->_folderList->setSelectionMode(QAbstractItemView::SingleSelection);
-            _ui->_folderList->setCurrentIndex(indx);
-            _ui->_folderList->scrollTo(indx);
+            ui->_folderList->setSelectionMode(QAbstractItemView::SingleSelection);
+            ui->_folderList->setCurrentIndex(indx);
+            ui->_folderList->scrollTo(indx);
        } else {
            qCWarning(lcAccountSettings) << "Unable to find a valid index for " << myFolder;
        }
@@ -1116,7 +1118,7 @@ void AccountSettings::slotLinkActivated(const QString &link)

 AccountSettings::~AccountSettings()
 {
-    delete _ui;
+    delete ui;
 }

 void AccountSettings::refreshSelectiveSyncStatus()
@@ -1154,8 +1156,8 @@ void AccountSettings::refreshSelectiveSyncStatus()
    }

    if (msg.isEmpty()) {
-        _ui->selectiveSyncButtons->setVisible(true);
-        _ui->bigFolderUi->setVisible(false);
+        ui->selectiveSyncButtons->setVisible(true);
+        ui->bigFolderUi->setVisible(false);
    } else {
        ConfigFile cfg;
        QString info = !cfg.confirmExternalStorage()
@@ -1164,27 +1166,27 @@ void AccountSettings::refreshSelectiveSyncStatus()
                ? tr("There are folders that were not synchronized because they are external storages: ")
                : tr("There are folders that were not synchronized because they are too big or external storages: ");

-        _ui->selectiveSyncNotification->setText(info + msg);
-        _ui->selectiveSyncButtons->setVisible(false);
-        _ui->bigFolderUi->setVisible(true);
+        ui->selectiveSyncNotification->setText(info + msg);
+        ui->selectiveSyncButtons->setVisible(false);
+        ui->bigFolderUi->setVisible(true);
        shouldBeVisible = true;
    }

-    _ui->selectiveSyncApply->setEnabled(_model->isDirty() || !msg.isEmpty());
-    bool wasVisible = !_ui->selectiveSyncStatus->isHidden();
+    ui->selectiveSyncApply->setEnabled(_model->isDirty() || !msg.isEmpty());
+    bool wasVisible = !ui->selectiveSyncStatus->isHidden();
    if (wasVisible != shouldBeVisible) {
-        QSize hint = _ui->selectiveSyncStatus->sizeHint();
+        QSize hint = ui->selectiveSyncStatus->sizeHint();
        if (shouldBeVisible) {
-            _ui->selectiveSyncStatus->setMaximumHeight(0);
-            _ui->selectiveSyncStatus->setVisible(true);
+            ui->selectiveSyncStatus->setMaximumHeight(0);
+            ui->selectiveSyncStatus->setVisible(true);
        }
-        auto anim = new QPropertyAnimation(_ui->selectiveSyncStatus, "maximumHeight", _ui->selectiveSyncStatus);
+        auto anim = new QPropertyAnimation(ui->selectiveSyncStatus, "maximumHeight", ui->selectiveSyncStatus);
        anim->setEndValue(shouldBeVisible ? hint.height() : 0);
        anim->start(QAbstractAnimation::DeleteWhenStopped);
        connect(anim, &QPropertyAnimation::finished, [this, shouldBeVisible]() {
-            _ui->selectiveSyncStatus->setMaximumHeight(QWIDGETSIZE_MAX);
+            ui->selectiveSyncStatus->setMaximumHeight(QWIDGETSIZE_MAX);
            if (!shouldBeVisible) {
-                _ui->selectiveSyncStatus->hide();
+                ui->selectiveSyncStatus->hide();
            }
        });
    }
@@ -1244,30 +1246,12 @@ bool AccountSettings::event(QEvent *e)
        // Expand the folder automatically only if there's only one, see #4283
        // The 2 is 1 folder + 1 'add folder' button
        if (_model->rowCount() <= 2) {
-            _ui->_folderList->setExpanded(_model->index(0, 0), true);
+            ui->_folderList->setExpanded(_model->index(0, 0), true);
        }
    }
    return QWidget::event(e);
 }

-void AccountSettings::slotStyleChanged()
-{
-    customizeStyle();
-
-    // Notify the other widgets (Dark-/Light-Mode switching)
-    emit styleChanged();
-}
-
-void AccountSettings::customizeStyle()
-{
-    QString msg = _ui->connectLabel->text();
-    Theme::replaceLinkColorStringBackgroundAware(msg);
-    _ui->connectLabel->setText(msg);
-
-    QColor color = palette().highlight().color();
-    _ui->quotaProgressBar->setStyleSheet(QString::fromLatin1(progressBarStyleC).arg(color.name()));
-}
-
 } // namespace OCC

 #include "accountsettings.moc"
--- a/src/gui/accountsettings.h
+++ b/src/gui/accountsettings.h
@@ -63,14 +63,11 @@ signals:
    void openFolderAlias(const QString &);
    void showIssuesList(AccountState *account);
    void requesetMnemonic();
-    void removeAccountFolders(AccountState *account);
-    void styleChanged();

 public slots:
    void slotOpenOC();
    void slotUpdateQuota(qint64, qint64);
    void slotAccountStateChanged();
-    void slotStyleChanged();

    AccountState *accountsState() { return _accountState; }

@@ -131,12 +128,11 @@ private:
    bool event(QEvent *) override;
    void createAccountToolbox();
    void openIgnoredFilesDialog(const QString & absFolderPath);
-    void customizeStyle();

    /// Returns the alias of the selected folder, empty string if none
    QString selectedFolderAlias() const;

-    Ui::AccountSettings *_ui;
+    Ui::AccountSettings *ui;

    FolderStatusModel *_model;
    QUrl _OCUrl;
--- a/src/gui/accountsettings.ui
+++ b/src/gui/accountsettings.ui
@@ -187,7 +187,7 @@
      <item row="0" column="2">
       <widget class="QToolButton" name="_accountToolbox">
        <property name="text">
-         <string notr="true">...</string>
+         <string>...</string>
        </property>
       </widget>
      </item>
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -14,7 +14,6 @@

 #include "accountstate.h"
 #include "accountmanager.h"
-#include "remotewipe.h"
 #include "account.h"
 #include "creds/abstractcredentials.h"
 #include "creds/httpcredentials.h"
@@ -25,11 +24,6 @@
 #include <QTimer>
 #include <qfontmetrics.h>

-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkRequest>
-#include <QBuffer>
-
 namespace OCC {

 Q_LOGGING_CATEGORY(lcAccountState, "nextcloud.gui.account.state", QtInfoMsg)
@@ -42,12 +36,11 @@ AccountState::AccountState(AccountPtr account)
    , _waitingForNewCredentials(false)
    , _notificationsEtagResponseHeader("*")
    , _maintenanceToConnectedDelay(60000 + (qrand() % (4 * 60000))) // 1-5min delay
-    , _remoteWipe(new RemoteWipe(_account))
 {
    qRegisterMetaType<AccountState *>("AccountState*");

    connect(account.data(), &Account::invalidCredentials,
-        this, &AccountState::slotHandleRemoteWipeCheck);
+        this, &AccountState::slotInvalidCredentials);
    connect(account.data(), &Account::credentialsFetched,
        this, &AccountState::slotCredentialsFetched);
    connect(account.data(), &Account::credentialsAsked,
@@ -310,7 +303,7 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
        break;
    case ConnectionValidator::CredentialsWrong:
    case ConnectionValidator::CredentialsNotReady:
-        handleInvalidCredentials();
+        slotInvalidCredentials();
        break;
    case ConnectionValidator::SslError:
        setState(SignedOut);
@@ -329,20 +322,7 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
    }
 }

-void AccountState::slotHandleRemoteWipeCheck()
-{
-    // make sure it changes account state and icons
-    signOutByUi();
-
-    qCInfo(lcAccountState) << "Invalid credentials for" << _account->url().toString()
-                           << "checking for remote wipe request";
-
-    _waitingForNewCredentials = false;
-    setState(SignedOut);
-}
-
-
-void AccountState::handleInvalidCredentials()
+void AccountState::slotInvalidCredentials()
 {
    if (isSignedOut() || _waitingForNewCredentials)
        return;
@@ -363,7 +343,6 @@ void AccountState::handleInvalidCredentials()
    account()->credentials()->askFromUser();
 }

-
 void AccountState::slotCredentialsFetched(AbstractCredentials *)
 {
    // Make a connection attempt, no matter whether the credentials are
--- a/src/gui/accountstate.h
+++ b/src/gui/accountstate.h
@@ -29,7 +29,6 @@ namespace OCC {

 class AccountState;
 class Account;
-class RemoteWipe;

 typedef QExplicitlySharedDataPointer<AccountState> AccountStatePtr;

@@ -151,9 +150,6 @@ public:
    */
    void setNavigationAppsEtagResponseHeader(const QByteArray &value);

-    ///Asks for user credentials
-    void handleInvalidCredentials();
-
 public slots:
    /// Triggers a ping to the server to update state and
    /// connection status and errors.
@@ -168,11 +164,7 @@ signals:

 protected Q_SLOTS:
    void slotConnectionValidatorResult(ConnectionValidator::Status status, const QStringList &errors);
-
-    /// When client gets a 401 or 403 checks if server requested remote wipe
-    /// before asking for user credentials again
-    void slotHandleRemoteWipeCheck();
-
+    void slotInvalidCredentials();
    void slotCredentialsFetched(AbstractCredentials *creds);
    void slotCredentialsAsked(AbstractCredentials *creds);

@@ -198,13 +190,6 @@ private:
     * Milliseconds for which to delay reconnection after 503/maintenance.
     */
    int _maintenanceToConnectedDelay;
-
-    /**
-     * Connects remote wipe check with the account
-     * the log out triggers the check (loads app password -> create request)
-     */
-    RemoteWipe *_remoteWipe;
-
 };
 }

--- a/src/gui/activitydata.cpp
+++ b/src/gui/activitydata.cpp
@@ -21,7 +21,7 @@ namespace OCC {

 bool operator<(const Activity &rhs, const Activity &lhs)
 {
-    return rhs._dateTime > lhs._dateTime;
+    return rhs._dateTime.toMSecsSinceEpoch() > lhs._dateTime.toMSecsSinceEpoch();
 }

 bool operator==(const Activity &rhs, const Activity &lhs)
--- a/src/gui/activityitemdelegate.cpp
+++ b/src/gui/activityitemdelegate.cpp
@@ -15,7 +15,6 @@
 */

 #include "activityitemdelegate.h"
-#include "activitylistmodel.h"
 #include "folderstatusmodel.h"
 #include "folderman.h"
 #include "accountstate.h"
@@ -27,14 +26,6 @@
 #include <QPainter>
 #include <QApplication>

-#define FIXME_USE_HIGH_DPI_RATIO
-#ifdef FIXME_USE_HIGH_DPI_RATIO
-    // FIXME: Find a better way to calculate the text width on high-dpi displays (Retina).
-    #include <QDesktopWidget>
-#endif
-
-#define HASQT5_11 (QT_VERSION >= QT_VERSION_CHECK(5,11,0))
-
 namespace OCC {

 int ActivityItemDelegate::_iconHeight = 0;
@@ -47,12 +38,6 @@ int ActivityItemDelegate::_buttonHeight = 0;
 const QString ActivityItemDelegate::_remote_share("remote_share");
 const QString ActivityItemDelegate::_call("call");

-ActivityItemDelegate::ActivityItemDelegate()
-    : QStyledItemDelegate()
-{
-    customizeStyle();
-}
-
 int ActivityItemDelegate::iconHeight()
 {
    if (_iconHeight == 0) {
@@ -102,26 +87,10 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    int iconSize = 16;
    int iconOffset = qRound(fm.height() / 4.0 * 7.0);
    int offset = 4;
-    const bool isSelected = (option.state & QStyle::State_Selected);
-#ifdef FIXME_USE_HIGH_DPI_RATIO
-    // FIXME: Find a better way to calculate the text width on high-dpi displays (Retina).
-    const int device_pixel_ration = QApplication::desktop()->devicePixelRatio();
-    int pixel_ratio = (device_pixel_ration > 1 ? device_pixel_ration : 1);
-#endif

    // get the data
    Activity::Type activityType = qvariant_cast<Activity::Type>(index.data(ActionRole));
-    QIcon actionIcon;
-    const ActivityListModel::ActionIcon icn = qvariant_cast<ActivityListModel::ActionIcon>(index.data(ActionIconRole));
-    switch(icn.iconType) {
-        case ActivityListModel::ActivityIconType::iconUseCached:        actionIcon = icn.cachedIcon;                                        break;
-        case ActivityListModel::ActivityIconType::iconActivity:         actionIcon = (isSelected ? _iconActivity_sel : _iconActivity);      break;
-        case ActivityListModel::ActivityIconType::iconBell:             actionIcon = (isSelected ? _iconBell_sel : _iconBell);              break;
-        case ActivityListModel::ActivityIconType::iconStateError:       actionIcon = _iconStateError;                                       break;
-        case ActivityListModel::ActivityIconType::iconStateWarning:     actionIcon = _iconStateWarning;                                     break;
-        case ActivityListModel::ActivityIconType::iconStateInfo:        actionIcon = _iconStateInfo;                                        break;
-        case ActivityListModel::ActivityIconType::iconStateSync:        actionIcon = _iconStateSync;                                        break;
-    }
+    QIcon actionIcon = qvariant_cast<QIcon>(index.data(ActionIconRole));
    QString objectType = qvariant_cast<QString>(index.data(ObjectTypeRole));
    QString actionText = qvariant_cast<QString>(index.data(ActionTextRole));
    QString messageText = qvariant_cast<QString>(index.data(MessageRole));
@@ -137,27 +106,15 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &

    // subject text rect
    QRect actionTextBox = actionIconRect;
-#if (HASQT5_11)
-    int actionTextBoxWidth = fm.horizontalAdvance(actionText);
-#else
    int actionTextBoxWidth = fm.width(actionText);
-#endif
    actionTextBox.setTop(option.rect.top() + margin + offset/2);
    actionTextBox.setHeight(fm.height());
    actionTextBox.setLeft(actionIconRect.right() + margin);
-#ifdef FIXME_USE_HIGH_DPI_RATIO
-    // FIXME: Find a better way to calculate the text width on high-dpi displays (Retina).
-    actionTextBoxWidth *= pixel_ratio;
-#endif
    actionTextBox.setRight(actionTextBox.left() + actionTextBoxWidth + margin);

    // message text rect
    QRect messageTextBox = actionTextBox;
-#if (HASQT5_11)
-    int messageTextWidth = fm.horizontalAdvance(messageText);
-#else
    int messageTextWidth = fm.width(messageText);
-#endif
    int messageTextTop = option.rect.top() + fm.height() + margin;
    if(actionText.isEmpty()) messageTextTop = option.rect.top() + margin + offset/2;
    messageTextBox.setTop(messageTextTop);
@@ -171,21 +128,14 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &

    // time box rect
    QRect timeBox = messageTextBox;
-#if (HASQT5_11)
-    int timeTextWidth = fm.horizontalAdvance(timeText);
-#else
-    int timeTextWidth = fm.width(timeText);
-#endif
+    QString timeStr = tr("%1").arg(timeText);
+    int timeTextWidth = fm.width(timeStr);
    int timeTop = option.rect.top() + fm.height() + fm.height() + margin + offset/2;
    if(messageText.isEmpty() || actionText.isEmpty())
        timeTop = option.rect.top() + fm.height() + margin;
    timeBox.setTop(timeTop);
    timeBox.setHeight(fm.height());
    timeBox.setBottom(timeBox.top() + fm.height());
-#ifdef FIXME_USE_HIGH_DPI_RATIO
-    // FIXME: Find a better way to calculate the text width on high-dpi displays (Retina).
-    timeTextWidth *= pixel_ratio;
-#endif
    timeBox.setRight(timeBox.left() + timeTextWidth + margin);

    // buttons - default values
@@ -220,9 +170,9 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    if(activityType == Activity::Type::NotificationType){

        // Secondary will be 'Dismiss' or '...' multiple options button
-        secondaryButton.icon = (isSelected ? _iconClose_sel : _iconClose);
+        secondaryButton.icon = QIcon(QLatin1String(":/client/resources/close.svg"));
        if(customList.size() > 1)
-            secondaryButton.icon = (isSelected ? _iconMore_sel : _iconMore);
+            secondaryButton.icon = QIcon(QLatin1String(":/client/resources/more.svg"));
        secondaryButton.iconSize = QSize(iconSize, iconSize);

        // Primary button will be 'More Information' or 'Accept'
@@ -230,11 +180,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
        if(objectType == _remote_share) primaryButton.text = tr("Accept");
        if(objectType == _call) primaryButton.text = tr("Join");

-#if (HASQT5_11)
-        primaryButton.rect.setLeft(left - margin * 2 - fm.horizontalAdvance(primaryButton.text));
-#else
        primaryButton.rect.setLeft(left - margin * 2 - fm.width(primaryButton.text));
-#endif

        // save info to be able to filter mouse clicks
        _buttonHeight = buttonSize;
@@ -245,17 +191,12 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    } else if(activityType == Activity::SyncResultType){

        // Secondary will be 'open file manager' with the folder icon
-        secondaryButton.icon = _iconFolder;
+        secondaryButton.icon = QIcon(QLatin1String(":/client/resources/folder.svg"));
        secondaryButton.iconSize = QSize(iconSize, iconSize);

        // Primary button will be 'open browser'
        primaryButton.text = tr("Open Browser");
-
-#if (HASQT5_11)
-        primaryButton.rect.setLeft(left - margin * 2 - fm.horizontalAdvance(primaryButton.text));
-#else
        primaryButton.rect.setLeft(left - margin * 2 - fm.width(primaryButton.text));
-#endif

        // save info to be able to filter mouse clicks
        _buttonHeight = buttonSize;
@@ -266,7 +207,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    } else if(activityType == Activity::SyncFileItemType){

        // Secondary will be 'open file manager' with the folder icon
-        secondaryButton.icon = _iconFolder;
+        secondaryButton.icon = QIcon(QLatin1String(":/client/resources/folder.svg"));
        secondaryButton.iconSize = QSize(iconSize, iconSize);

        // No primary button on this case
@@ -291,7 +232,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
        p.setCurrentColorGroup(QPalette::Disabled);

    // change pen color if the line is selected
-    if (isSelected)
+    if (option.state & QStyle::State_Selected)
        painter->setPen(p.color(QPalette::HighlightedText));
    else
        painter->setPen(p.color(QPalette::Text));
@@ -305,15 +246,8 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    painter->drawText(actionTextBox, elidedAction);

    // draw the buttons
-    if(activityType == Activity::Type::NotificationType || activityType == Activity::Type::SyncResultType) {
-        primaryButton.palette = p;
-        if (isSelected)
-            primaryButton.palette.setColor(QPalette::ButtonText, p.color(QPalette::HighlightedText));
-        else
-            primaryButton.palette.setColor(QPalette::ButtonText, p.color(QPalette::Text));
-
+    if(activityType == Activity::Type::NotificationType || activityType == Activity::Type::SyncResultType)
        QApplication::style()->drawControl(QStyle::CE_PushButton, &primaryButton, painter);
-    }

    // Since they are errors on local syncing, there is nothing to do in the server
    if(activityType != Activity::Type::ActivityType)
@@ -327,13 +261,13 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    }

    // change pen color for the time
-    if (isSelected)
+    if (option.state & QStyle::State_Selected)
        painter->setPen(p.color(QPalette::Disabled, QPalette::HighlightedText));
    else
        painter->setPen(p.color(QPalette::Disabled, QPalette::Text));

    // draw the time
-    const QString elidedTime = fm.elidedText(timeText, Qt::ElideRight, spaceLeftForText);
+    const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, spaceLeftForText);
    painter->drawText(timeBox, elidedTime);

    painter->restore();
@@ -376,32 +310,4 @@ bool ActivityItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
    return QStyledItemDelegate::editorEvent(event, model, option, index);
 }

-void ActivityItemDelegate::slotStyleChanged()
-{
-    customizeStyle();
-}
-
-void ActivityItemDelegate::customizeStyle()
-{
-    QPalette pal;
-    pal.setColor(QPalette::Base, QColor(0,0,0));    // use dark background colour to invert icons
-
-    _iconClose        = Theme::createColorAwareIcon(QLatin1String(":/client/resources/close.svg"));
-    _iconClose_sel    = Theme::createColorAwareIcon(QLatin1String(":/client/resources/close.svg"), pal);
-    _iconMore         = Theme::createColorAwareIcon(QLatin1String(":/client/resources/more.svg"));
-    _iconMore_sel     = Theme::createColorAwareIcon(QLatin1String(":/client/resources/more.svg"), pal);
-
-    _iconFolder       = QIcon(QLatin1String(":/client/resources/folder.svg"));
-
-    _iconActivity     = Theme::createColorAwareIcon(QLatin1String(":/client/resources/activity.png"));
-    _iconActivity_sel = Theme::createColorAwareIcon(QLatin1String(":/client/resources/activity.png"), pal);
-    _iconBell         = Theme::createColorAwareIcon(QLatin1String(":/client/resources/bell.svg"));
-    _iconBell_sel     = Theme::createColorAwareIcon(QLatin1String(":/client/resources/bell.svg"), pal);
-
-    _iconStateError   = QIcon(QLatin1String(":/client/resources/state-error.svg"));
-    _iconStateWarning = QIcon(QLatin1String(":/client/resources/state-warning.svg"));
-    _iconStateInfo    = QIcon(QLatin1String(":/client/resources/state-info.svg"));
-    _iconStateSync    = QIcon(QLatin1String(":/client/resources/state-sync.svg"));
-}
-
 } // namespace OCC
--- a/src/gui/activityitemdelegate.h
+++ b/src/gui/activityitemdelegate.h
@@ -43,8 +43,6 @@ public:
        AccountConnectedRole,
        SyncFileStatusRole };

-    ActivityItemDelegate();
-
    void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override;
    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
@@ -53,16 +51,11 @@ public:
    static int rowHeight();
    static int iconHeight();

-public slots:
-    void slotStyleChanged();
-
 signals:
    void primaryButtonClickedOnItemView(const QModelIndex &index);
    void secondaryButtonClickedOnItemView(const QModelIndex &index);

 private:
-    void customizeStyle();
-
    static int _margin;
    static int _iconHeight;
    static int _primaryButtonWidth;
@@ -72,23 +65,6 @@ private:
    static int _buttonHeight;
    static const QString _remote_share;
    static const QString _call;
-
-    QIcon _iconClose;
-    QIcon _iconClose_sel;
-    QIcon _iconMore;
-    QIcon _iconMore_sel;
-
-    QIcon _iconFolder;
-
-    QIcon _iconActivity;
-    QIcon _iconActivity_sel;
-    QIcon _iconBell;
-    QIcon _iconBell_sel;
-
-    QIcon _iconStateError;
-    QIcon _iconStateWarning;
-    QIcon _iconStateInfo;
-    QIcon _iconStateSync;
 };

 } // namespace OCC
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/activitylistmodel.cpp
@@ -71,14 +71,13 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
                return QVariant(list.at(0));
            }
            // File does not exist anymore? Let's try to open its path
-            if(QFileInfo(relPath).exists()) {
-                list = FolderMan::instance()->findFileInLocalFolders(QFileInfo(relPath).path(), ast->account());
-                if (list.count() > 0) {
-                    return QVariant(list.at(0));
-                }
+            list = FolderMan::instance()->findFileInLocalFolders(QFileInfo(relPath).path(), ast->account());
+            if (list.count() > 0) {
+                return QVariant(list.at(0));
            }
        }
        return QVariant();
+        break;
     case ActivityItemDelegate::ActionsLinksRole:{
        QList<QVariant> customList;
        foreach (ActivityLink customItem, a._links) {
@@ -87,61 +86,61 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
            customList << customVariant;
        }
        return customList;
+        break;
    }
-    case ActivityItemDelegate::ActionIconRole:{
-        ActionIcon actionIcon;
+    case ActivityItemDelegate::ActionIconRole:
        if(a._type == Activity::NotificationType){
           QIcon cachedIcon = ServerNotificationHandler::iconCache.value(a._id);
-            if(!cachedIcon.isNull()) {
-               actionIcon.iconType = ActivityIconType::iconUseCached;
-               actionIcon.cachedIcon = cachedIcon;
-            } else {
-                actionIcon.iconType = ActivityIconType::iconBell;
-            }
+           if(!cachedIcon.isNull())
+               return cachedIcon;
+           else return QIcon(QLatin1String(":/client/resources/bell.svg"));
        } else if(a._type == Activity::SyncResultType){
-            actionIcon.iconType = ActivityIconType::iconStateError;
+            return QIcon(QLatin1String(":/client/resources/state-error.svg"));
        } else if(a._type == Activity::SyncFileItemType){
               if(a._status == SyncFileItem::NormalError
                   || a._status == SyncFileItem::FatalError
                   || a._status == SyncFileItem::DetailError
                   || a._status == SyncFileItem::BlacklistedError) {
-                   actionIcon.iconType = ActivityIconType::iconStateError;
+                   return QIcon(QLatin1String(":/client/resources/state-error.svg"));
               } else if(a._status == SyncFileItem::SoftError
                         || a._status == SyncFileItem::Conflict
                         || a._status == SyncFileItem::Restoration
                         || a._status == SyncFileItem::FileLocked){
-                   actionIcon.iconType = ActivityIconType::iconStateWarning;
+                   return QIcon(QLatin1String(":/client/resources/state-warning.svg"));
               } else if(a._status == SyncFileItem::FileIgnored){
-                   actionIcon.iconType = ActivityIconType::iconStateInfo;
-               } else {
-                   actionIcon.iconType = ActivityIconType::iconStateSync;
+                   return QIcon(QLatin1String(":/client/resources/state-info.svg"));
               }
-        } else {
-            actionIcon.iconType = ActivityIconType::iconActivity;
+               return QIcon(QLatin1String(":/client/resources/state-sync.svg"));
        }
-        QVariant icn;
-        icn.setValue(actionIcon);
-        return icn;
-    }
+        return QIcon(QLatin1String(":/client/resources/activity.png"));
+        break;
    case ActivityItemDelegate::ObjectTypeRole:
        return a._objectType;
+        break;
    case ActivityItemDelegate::ActionRole:{
        QVariant type;
        type.setValue(a._type);
        return type;
+        break;
    }
    case ActivityItemDelegate::ActionTextRole:
        return a._subject;
+        break;
    case ActivityItemDelegate::MessageRole:
        return a._message;
+        break;
    case ActivityItemDelegate::LinkRole:
        return a._link;
+        break;
    case ActivityItemDelegate::AccountRole:
        return a._accName;
+        break;
    case ActivityItemDelegate::PointInTimeRole:
-        return QString("%1 (%2)").arg(a._dateTime.toLocalTime().toString(Qt::DefaultLocaleShortDate), Utility::timeAgoInWords(a._dateTime.toLocalTime()));
+        return Utility::timeAgoInWords(a._dateTime);
+        break;
    case ActivityItemDelegate::AccountConnectedRole:
        return (ast && ast->isConnected());
+        break;
    default:
        return QVariant();
    }
@@ -230,29 +229,6 @@ void ActivityListModel::addErrorToActivityList(Activity activity) {
    combineActivityLists();
 }

-void ActivityListModel::addIgnoredFileToList(Activity newActivity) {
-    qCInfo(lcActivity) << "First checking for duplicates then add file to the notification list of ignored files: " << newActivity._file;
-
-    bool duplicate = false;
-    if(_listOfIgnoredFiles.size() == 0){
-        _notificationIgnoredFiles = newActivity;
-        _notificationIgnoredFiles._subject = tr("Files from the ignore list as well as symbolic links are not synced. This includes:");
-        _listOfIgnoredFiles.append(newActivity);
-        return;
-    }
-
-    foreach(Activity activity, _listOfIgnoredFiles){
-        if(activity._file == newActivity._file){
-            duplicate = true;
-            break;
-        }
-    }
-
-    if(!duplicate){
-        _notificationIgnoredFiles._message.append(", " + newActivity._file);
-    }
-}
-
 void ActivityListModel::addNotificationToActivityList(Activity activity) {
    qCInfo(lcActivity) << "Notification successfully added to the notification list: " << activity._subject;
    _notificationLists.prepend(activity);
@@ -266,7 +242,7 @@ void ActivityListModel::clearNotifications() {
 }

 void ActivityListModel::removeActivityFromActivityList(int row) {
-    Activity activity = _finalList.at(row);
+    Activity activity =  _finalList.at(row);
    removeActivityFromActivityList(activity);
    combineActivityLists();
 }
@@ -300,31 +276,22 @@ void ActivityListModel::removeActivityFromActivityList(Activity activity) {
    }
 }

+
 void ActivityListModel::combineActivityLists()
 {
    ActivityList resultList;

-    if(_notificationErrorsLists.count() > 0) {
-        std::sort(_notificationErrorsLists.begin(), _notificationErrorsLists.end());
-        resultList.append(_notificationErrorsLists);
-    }
-    if(_listOfIgnoredFiles.size() > 0)
-        resultList.append(_notificationIgnoredFiles);
+    std::sort(_notificationErrorsLists.begin(), _notificationErrorsLists.end());
+    resultList.append(_notificationErrorsLists);

-    if(_notificationLists.count() > 0) {
-        std::sort(_notificationLists.begin(), _notificationLists.end());
-        resultList.append(_notificationLists);
-    }
+    std::sort(_notificationLists.begin(), _notificationLists.end());
+    resultList.append(_notificationLists);

-    if(_syncFileItemLists.count() > 0) {
-        std::sort(_syncFileItemLists.begin(), _syncFileItemLists.end());
-        resultList.append(_syncFileItemLists);
-    }
+    std::sort(_syncFileItemLists.begin(), _syncFileItemLists.end());
+    resultList.append(_syncFileItemLists);

-    if(_activityLists.count() > 0) {
-        std::sort(_activityLists.begin(), _activityLists.end());
-        resultList.append(_activityLists);
-    }
+    std::sort(_activityLists.begin(), _activityLists.end());
+    resultList.append(_activityLists);

    beginResetModel();
    _finalList.clear();
--- a/src/gui/activitylistmodel.h
+++ b/src/gui/activitylistmodel.h
@@ -38,20 +38,6 @@ class ActivityListModel : public QAbstractListModel
 {
    Q_OBJECT
 public:
-    enum ActivityIconType {
-        iconUseCached = 0,
-        iconActivity,
-        iconBell,
-        iconStateError,
-        iconStateWarning,
-        iconStateInfo,
-        iconStateSync
-    };
-    struct ActionIcon {
-        ActivityIconType iconType;
-        QIcon cachedIcon;
-    };
-
    explicit ActivityListModel(AccountState *accountState, QWidget *parent = nullptr);

    QVariant data(const QModelIndex &index, int role) const override;
@@ -65,7 +51,6 @@ public:
    void addNotificationToActivityList(Activity activity);
    void clearNotifications();
    void addErrorToActivityList(Activity activity);
-    void addIgnoredFileToList(Activity newActivity);
    void addSyncFileItemToActivityList(Activity activity);
    void removeActivityFromActivityList(int row);
    void removeActivityFromActivityList(Activity activity);
@@ -88,8 +73,6 @@ private:
    ActivityList _activityLists;
    ActivityList _syncFileItemLists;
    ActivityList _notificationLists;
-    ActivityList _listOfIgnoredFiles;
-    Activity _notificationIgnoredFiles;
    ActivityList _notificationErrorsLists;
    ActivityList _finalList;
    AccountState *_accountState;
@@ -98,7 +81,4 @@ private:
    int _currentItem = 0;
 };
 }
-
-Q_DECLARE_METATYPE(OCC::ActivityListModel::ActionIcon)
-
 #endif // ACTIVITYLISTMODEL_H
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -89,9 +89,6 @@ ActivityWidget::ActivityWidget(AccountState *accountState, QWidget *parent)
        this, &ActivityWidget::addError);

    _removeTimer.setInterval(1000);
-
-    // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
-    connect(this, &ActivityWidget::styleChanged, delegate, &ActivityItemDelegate::slotStyleChanged);
 }

 ActivityWidget::~ActivityWidget()
@@ -130,12 +127,11 @@ void ActivityWidget::slotProgressInfo(const QString &folder, const ProgressInfo
            }


-            if(activity._status == SyncFileItem::FileIgnored && !QFileInfo(f->path() + activity._file).exists()) {
+            if(activity._status == SyncFileItem::FileIgnored && !QFileInfo(f->path() + activity._file).exists()){
                _model->removeActivityFromActivityList(activity);
                continue;
            }

-
            if(!QFileInfo(f->path() + activity._file).exists()){
                _model->removeActivityFromActivityList(activity);
                continue;
@@ -179,7 +175,7 @@ void ActivityWidget::slotItemCompleted(const QString &folder, const SyncFileItem
        Activity activity;
        activity._type = Activity::SyncFileItemType; //client activity
        activity._status = item->_status;
-        activity._dateTime = QDateTime::currentDateTime();
+        activity._dateTime = QDateTime::fromString(QDateTime::currentDateTime().toString(), Qt::ISODate);
        activity._message = item->_originalFile;
        activity._link = folderInstance->accountState()->account()->url();
        activity._accName = folderInstance->accountState()->account()->displayName();
@@ -195,12 +191,8 @@ void ActivityWidget::slotItemCompleted(const QString &folder, const SyncFileItem
            qCWarning(lcActivity) << "Item " << item->_file << " retrieved resulted in error " << item->_errorString;
            activity._subject = item->_errorString;

-            if(item->_status == SyncFileItem::Status::FileIgnored) {
-                _model->addIgnoredFileToList(activity);
-            } else {
-                // add 'protocol error' to activity list
-                _model->addErrorToActivityList(activity);
-            }
+            // add 'protocol error' to activity list
+            _model->addErrorToActivityList(activity);
        }
    }
 }
@@ -551,12 +543,6 @@ void ActivityWidget::slotNotifyServerFinished(const QString &reply, int replyCod
    qCInfo(lcActivity) << "Server Notification reply code" << replyCode << reply;
 }

-void ActivityWidget::slotStyleChanged()
-{
-    // Notify the other widgets (Dark-/Light-Mode switching)
-    emit styleChanged();
-}
-
 /* ==================================================================== */

 ActivitySettings::ActivitySettings(AccountState *accountState, QWidget *parent)
@@ -579,9 +565,6 @@ ActivitySettings::ActivitySettings(AccountState *accountState, QWidget *parent)
    // connect a model signal to stop the animation
    connect(_activityWidget, &ActivityWidget::rowsInserted, _progressIndicator, &QProgressIndicator::stopAnimation);
    connect(_activityWidget, &ActivityWidget::rowsInserted, this, &ActivitySettings::slotDisplayActivities);
-
-    // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
-    connect(this, &ActivitySettings::styleChanged, _activityWidget, &ActivityWidget::slotStyleChanged);
 }

 void ActivitySettings::slotDisplayActivities(){
@@ -640,14 +623,4 @@ bool ActivitySettings::event(QEvent *e)
 ActivitySettings::~ActivitySettings()
 {
 }
-
-void ActivitySettings::slotStyleChanged()
-{
-    if(_progressIndicator)
-        _progressIndicator->setColor(QGuiApplication::palette().color(QPalette::Text));
-
-    // Notify the other widgets (Dark-/Light-Mode switching)
-    emit styleChanged();
-}
-
 }
--- a/src/gui/activitywidget.h
+++ b/src/gui/activitywidget.h
@@ -78,14 +78,12 @@ public slots:
    void addError(const QString &folderAlias, const QString &message, ErrorCategory category);
    void slotProgressInfo(const QString &folder, const ProgressInfo &progress);
    void slotItemCompleted(const QString &folder, const SyncFileItemPtr &item);
-    void slotStyleChanged();

 signals:
    void guiLog(const QString &, const QString &);
    void rowsInserted();
    void hideActivityTab(bool);
    void sendNotificationRequest(const QString &accountName, const QString &link, const QByteArray &verb, int row);
-    void styleChanged();

 private slots:
    void slotBuildNotificationDisplay(const ActivityList &list);
@@ -98,7 +96,6 @@ private slots:
    void slotSecondaryButtonClickedOnListView(const QModelIndex &index);

 private:
-    void customizeStyle();
    void showLabels();
    QString timeString(QDateTime dt, QLocale::FormatType format) const;
    Ui::ActivityWidget *_ui;
@@ -140,7 +137,6 @@ public slots:
    void slotRefresh();
    void slotRemoveAccount();
    void setNotificationRefreshInterval(std::chrono::milliseconds interval);
-    void slotStyleChanged();

 private slots:
    void slotRegularNotificationCheck();
@@ -148,7 +144,6 @@ private slots:

 signals:
    void guiLog(const QString &, const QString &);
-    void styleChanged();

 private:
    bool event(QEvent *e) override;
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -108,7 +108,6 @@ Application::Application(int &argc, char **argv)
    , _userTriggeredConnect(false)
    , _debugMode(false)
    , _backgroundMode(false)
-    , _isQuitting(false)
 {
    _startedAt.start();

@@ -254,9 +253,6 @@ Application::Application(int &argc, char **argv)

    // Cleanup at Quit.
    connect(this, &QCoreApplication::aboutToQuit, this, &Application::slotCleanup);
-
-    // Allow other classes to hook into isShowingSettingsDialog() signals (re-auth widgets, for example)
-    connect(_gui.data(), &ownCloudGui::isShowingSettingsDialog, this, &Application::slotGuiIsShowingSettings);
 }

 Application::~Application()
@@ -268,8 +264,6 @@ Application::~Application()
    }

    // Remove the account from the account manager so it can be deleted.
-    disconnect(AccountManager::instance(), &AccountManager::accountRemoved,
-        this, &Application::slotAccountStateRemoved);
    AccountManager::instance()->shutdown();
 }

@@ -289,7 +283,7 @@ void Application::slotAccountStateRemoved(AccountState *accountState)
    }

    // if there is no more account, show the wizard.
-    if (!_isQuitting && AccountManager::instance()->accounts().isEmpty()) {
+    if (AccountManager::instance()->accounts().isEmpty()) {
        // allow to add a new account if there is non any more. Always think
        // about single account theming!
        OwncloudSetupWizard::runWizard(this, SLOT(slotownCloudWizardDone(int)));
@@ -312,8 +306,6 @@ void Application::slotAccountStateAdded(AccountState *accountState)

 void Application::slotCleanup()
 {
-    _isQuitting = true;
-
    AccountManager::instance()->save();
    FolderMan::instance()->unloadAndDeleteAllFolders();

@@ -651,9 +643,5 @@ void Application::showSettingsDialog()
    _gui->slotShowSettings();
 }

-void Application::slotGuiIsShowingSettings()
-{
-    emit isShowingSettingsDialog();
-}

 } // namespace OCC
--- a/src/gui/application.h
+++ b/src/gui/application.h
@@ -82,7 +82,6 @@ protected:
 signals:
    void folderRemoved();
    void folderStateChanged(Folder *);
-    void isShowingSettingsDialog();

 protected slots:
    void slotParseMessage(const QString &, QObject *);
@@ -92,7 +91,6 @@ protected slots:
    void slotAccountStateAdded(AccountState *accountState);
    void slotAccountStateRemoved(AccountState *accountState);
    void slotSystemOnlineConfigurationChanged(QNetworkConfiguration);
-    void slotGuiIsShowingSettings();

 private:
    void setHelp();
@@ -116,7 +114,6 @@ private:
    bool _userTriggeredConnect;
    bool _debugMode;
    bool _backgroundMode;
-    bool _isQuitting;

    ClientProxy _proxy;

--- a/src/gui/creds/flow2auth.cpp
+++ b/src/gui/creds/flow2auth.cpp
@@ -14,12 +14,10 @@
 */

 #include <QDesktopServices>
-#include <QApplication>
-#include <QClipboard>
 #include <QTimer>
 #include <QBuffer>
 #include "account.h"
-#include "flow2auth.h"
+#include "creds/flow2auth.h"
 #include <QJsonObject>
 #include <QJsonDocument>
 #include "theme.h"
@@ -30,17 +28,6 @@ namespace OCC {

 Q_LOGGING_CATEGORY(lcFlow2auth, "nextcloud.sync.credentials.flow2auth", QtInfoMsg)

-
-Flow2Auth::Flow2Auth(Account *account, QObject *parent)
-    : QObject(parent)
-    , _account(account)
-    , _isBusy(false)
-    , _hasToken(false)
-{
-    _pollTimer.setInterval(1000);
-    QObject::connect(&_pollTimer, &QTimer::timeout, this, &Flow2Auth::slotPollTimerTimeout);
-}
-
 Flow2Auth::~Flow2Auth()
 {
 }
@@ -60,46 +47,22 @@ QUrl Flow2Auth::authorisationLink() const

 void Flow2Auth::openBrowser()
 {
-    fetchNewToken(TokenAction::actionOpenBrowser);
-}
-
-void Flow2Auth::copyLinkToClipboard()
-{
-    fetchNewToken(TokenAction::actionCopyLinkToClipboard);
-}
-
-void Flow2Auth::fetchNewToken(const TokenAction action)
-{
-    if(_isBusy)
-        return;
-
-    _isBusy = true;
-    _hasToken = false;
-
-    emit statusChanged(PollStatus::statusFetchToken, 0);
+    _pollTimer.stop();

    // Step 1: Initiate a login, do an anonymous POST request
    QUrl url = Utility::concatUrlPath(_account->url().toString(), QLatin1String("/index.php/login/v2"));

-    // add 'Content-Length: 0' header (see https://github.com/nextcloud/desktop/issues/1473)
-    QNetworkRequest req;
-    req.setHeader(QNetworkRequest::ContentLengthHeader, "0");
-
-    auto job = _account->sendRequest("POST", url, req);
+    auto job = _account->sendRequest("POST", url);
    job->setTimeout(qMin(30 * 1000ll, job->timeoutMsec()));

-    QObject::connect(job, &SimpleNetworkJob::finishedSignal, this, [this, action](QNetworkReply *reply) {
+    QObject::connect(job, &SimpleNetworkJob::finishedSignal, this, [this](QNetworkReply *reply) {
        auto jsonData = reply->readAll();
        QJsonParseError jsonParseError;
        QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object();
-        QString pollToken, pollEndpoint, loginUrl;

-        if (reply->error() == QNetworkReply::NoError && jsonParseError.error == QJsonParseError::NoError
-            && !json.isEmpty()) {
-            pollToken = json.value("poll").toObject().value("token").toString();
-            pollEndpoint = json.value("poll").toObject().value("endpoint").toString();
-            loginUrl = json["login"].toString();
-        }
+        QString pollToken = json.value("poll").toObject().value("token").toString();
+        QString pollEndpoint = json.value("poll").toObject().value("endpoint").toString();
+        QUrl loginUrl = json["login"].toString();

        if (reply->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError
            || json.isEmpty() || pollToken.isEmpty() || pollEndpoint.isEmpty() || loginUrl.isEmpty()) {
@@ -118,9 +81,7 @@ void Flow2Auth::fetchNewToken(const TokenAction action)
                errorReason = tr("The reply from the server did not contain all expected fields");
            }
            qCWarning(lcFlow2auth) << "Error when getting the loginUrl" << json << errorReason;
-            emit result(Error, errorReason);
-            _pollTimer.stop();
-            _isBusy = false;
+            emit result(Error);
            return;
        }

@@ -134,50 +95,23 @@ void Flow2Auth::fetchNewToken(const TokenAction action)
        ConfigFile cfg;
        std::chrono::milliseconds polltime = cfg.remotePollInterval();
        qCInfo(lcFlow2auth) << "setting remote poll timer interval to" << polltime.count() << "msec";
-        _secondsInterval = (polltime.count() / 1000);
-        _secondsLeft = _secondsInterval;
-        emit statusChanged(PollStatus::statusPollCountdown, _secondsLeft);
+        _pollTimer.setInterval(polltime.count());
+        QObject::connect(&_pollTimer, &QTimer::timeout, this, &Flow2Auth::slotPollTimerTimeout);
+        _pollTimer.start();

-        if(!_pollTimer.isActive()) {
-            _pollTimer.start();
+
+        // Try to open Browser
+        if (!QDesktopServices::openUrl(authorisationLink())) {
+            // We cannot open the browser, then we claim we don't support Flow2Auth.
+            // Our UI callee should ask the user to copy and open the link.
+            emit result(NotSupported, QString());
        }
-
-
-        switch(action)
-        {
-        case actionOpenBrowser:
-            // Try to open Browser
-            if (!QDesktopServices::openUrl(authorisationLink())) {
-                // We cannot open the browser, then we claim we don't support Flow2Auth.
-                // Our UI callee will ask the user to copy and open the link.
-                emit result(NotSupported);
-            }
-            break;
-        case actionCopyLinkToClipboard:
-            QApplication::clipboard()->setText(authorisationLink().toString(QUrl::FullyEncoded));
-            emit statusChanged(PollStatus::statusCopyLinkToClipboard, 0);
-            break;
-        }
-
-        _isBusy = false;
-        _hasToken = true;
    });
 }

 void Flow2Auth::slotPollTimerTimeout()
 {
-    if(_isBusy || !_hasToken)
-        return;
-
-    _isBusy = true;
-
-    _secondsLeft--;
-    if(_secondsLeft > 0) {
-        emit statusChanged(PollStatus::statusPollCountdown, _secondsLeft);
-        _isBusy = false;
-        return;
-    }
-    emit statusChanged(PollStatus::statusPollNow, 0);
+    _pollTimer.stop();

    // Step 2: Poll
    QNetworkRequest req;
@@ -194,15 +128,10 @@ void Flow2Auth::slotPollTimerTimeout()
        auto jsonData = reply->readAll();
        QJsonParseError jsonParseError;
        QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object();
-        QUrl serverUrl;
-        QString loginName, appPassword;

-        if (reply->error() == QNetworkReply::NoError && jsonParseError.error == QJsonParseError::NoError
-            && !json.isEmpty()) {
-            serverUrl = json["server"].toString();
-            loginName = json["loginName"].toString();
-            appPassword = json["appPassword"].toString();
-        }
+        QUrl serverUrl = json["server"].toString();
+        QString loginName = json["loginName"].toString();
+        QString appPassword = json["appPassword"].toString();

        if (reply->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError
            || json.isEmpty() || serverUrl.isEmpty() || loginName.isEmpty() || appPassword.isEmpty()) {
@@ -222,50 +151,26 @@ void Flow2Auth::slotPollTimerTimeout()
            }
            qCDebug(lcFlow2auth) << "Error when polling for the appPassword" << json << errorReason;

-            // We get a 404 until authentication is done, so don't show this error in the GUI.
-            if(reply->error() != QNetworkReply::ContentNotFoundError)
-                emit result(Error, errorReason);
-
            // Forget sensitive data
            appPassword.clear();
            loginName.clear();

            // Failed: poll again
-            _secondsLeft = _secondsInterval;
-            _isBusy = false;
+            _pollTimer.start();
            return;
        }

-        _pollTimer.stop();
-
        // Success
        qCInfo(lcFlow2auth) << "Success getting the appPassword for user: " << loginName << ", server: " << serverUrl.toString();

        _account->setUrl(serverUrl);

-        emit result(LoggedIn, QString(), loginName, appPassword);
+        emit result(LoggedIn, loginName, appPassword);

        // Forget sensitive data
        appPassword.clear();
        loginName.clear();
-
-        _loginUrl.clear();
-        _pollToken.clear();
-        _pollEndpoint.clear();
-
-        _isBusy = false;
-        _hasToken = false;
    });
 }

-void Flow2Auth::slotPollNow()
-{
-    // poll now if we're not already doing so
-    if(_isBusy || !_hasToken)
-        return;
-
-    _secondsLeft = 1;
-    slotPollTimerTimeout();
-}
-
 } // namespace OCC
--- a/src/gui/creds/flow2auth.h
+++ b/src/gui/creds/flow2auth.h
@@ -25,23 +25,17 @@ namespace OCC {
 * Job that does the authorization, grants and fetches the access token via Login Flow v2
 *
 * See: https://docs.nextcloud.com/server/latest/developer_manual/client_apis/LoginFlow/index.html#login-flow-v2
+ *
 */
 class Flow2Auth : public QObject
 {
    Q_OBJECT
 public:
-    enum TokenAction {
-        actionOpenBrowser = 1,
-        actionCopyLinkToClipboard
-    };
-    enum PollStatus {
-        statusPollCountdown = 1,
-        statusPollNow,
-        statusFetchToken,
-        statusCopyLinkToClipboard
-    };
-
-    Flow2Auth(Account *account, QObject *parent);
+    Flow2Auth(Account *account, QObject *parent)
+            : QObject(parent)
+            , _account(account)
+    {
+    }
    ~Flow2Auth();

    enum Result { NotSupported,
@@ -50,7 +44,6 @@ public:
    Q_ENUM(Result);
    void start();
    void openBrowser();
-    void copyLinkToClipboard();
    QUrl authorisationLink() const;

 signals:
@@ -58,29 +51,18 @@ signals:
     * The state has changed.
     * when logged in, appPassword has the value of the app password.
     */
-    void result(Flow2Auth::Result result, const QString &errorString = QString(),
-                const QString &user = QString(), const QString &appPassword = QString());
-
-    void statusChanged(const PollStatus status, int secondsLeft);
-
-public slots:
-    void slotPollNow();
+    void result(Flow2Auth::Result result, const QString &user = QString(), const QString &appPassword = QString());

 private slots:
    void slotPollTimerTimeout();

 private:
-    void fetchNewToken(const TokenAction action);
-
    Account *_account;
    QUrl _loginUrl;
    QString _pollToken;
    QString _pollEndpoint;
    QTimer _pollTimer;
-    int _secondsLeft;
-    int _secondsInterval;
-    bool _isBusy;
-    bool _hasToken;
 };

+
 } // namespace OCC
--- a/src/gui/creds/keychainchunk.cpp
+++ b/src/gui/creds/keychainchunk.cpp
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) by Michael Schuster <michael@nextcloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#include "account.h"
-#include "keychainchunk.h"
-#include "theme.h"
-#include "networkjobs.h"
-#include "configfile.h"
-#include "creds/abstractcredentials.h"
-
-using namespace QKeychain;
-
-namespace OCC {
-
-Q_LOGGING_CATEGORY(lcKeychainChunk, "nextcloud.sync.credentials.keychainchunk", QtInfoMsg)
-
-namespace KeychainChunk {
-
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
-static void addSettingsToJob(Account *account, QKeychain::Job *job)
-{
-    Q_UNUSED(account)
-    auto settings = ConfigFile::settingsWithGroup(Theme::instance()->appName());
-    settings->setParent(job); // make the job parent to make setting deleted properly
-    job->setSettings(settings.release());
-}
-#endif
-
-/*
-* Job
-*/
-Job::Job(QObject *parent)
-    : QObject(parent)
-{
-    _serviceName = Theme::instance()->appName();
-}
-
-/*
-* WriteJob
-*/
-WriteJob::WriteJob(Account *account, const QString &key, const QByteArray &data, QObject *parent)
-    : Job(parent)
-{
-    _account = account;
-    _key = key;
-
-    // Windows workaround: Split the private key into chunks of 2048 bytes,
-    // to allow 4k (4096 bit) keys to be saved (obey Windows's limits)
-    _chunkBuffer = data;
-    _chunkCount = 0;
-}
-
-void WriteJob::start()
-{
-    slotWriteJobDone(nullptr);
-}
-
-void WriteJob::slotWriteJobDone(QKeychain::Job *incomingJob)
-{
-    QKeychain::WritePasswordJob *writeJob = static_cast<QKeychain::WritePasswordJob *>(incomingJob);
-
-    // errors?
-    if (writeJob) {
-        _error = writeJob->error();
-        _errorString = writeJob->errorString();
-
-        if (writeJob->error() != NoError) {
-            qCWarning(lcKeychainChunk) << "Error while writing" << writeJob->key() << "chunk" << writeJob->errorString();
-            _chunkBuffer.clear();
-        }
-    }
-
-    // write a chunk if there is any in the buffer
-    if (!_chunkBuffer.isEmpty()) {
-#if defined(Q_OS_WIN)
-        // Windows workaround: Split the data into chunks of 2048 bytes,
-        // to allow 4k (4096 bit) keys to be saved (obey Windows's limits)
-        auto chunk = _chunkBuffer.left(KeychainChunk::ChunkSize);
-
-        _chunkBuffer = _chunkBuffer.right(_chunkBuffer.size() - chunk.size());
-#else
-        // write full data in one chunk on non-Windows, as usual
-        auto chunk = _chunkBuffer;
-
-        _chunkBuffer.clear();
-#endif
-        auto index = (_chunkCount++);
-
-        // keep the limit
-        if (_chunkCount > KeychainChunk::MaxChunks) {
-            qCWarning(lcKeychainChunk) << "Maximum chunk count exceeded while writing" << writeJob->key() << "chunk" << QString::number(index) << "cutting off after" << QString::number(KeychainChunk::MaxChunks) << "chunks";
-
-            writeJob->deleteLater();
-
-            _chunkBuffer.clear();
-
-            emit finished(this);
-            return;
-        }
-
-        const QString kck = AbstractCredentials::keychainKey(
-            _account->url().toString(),
-            _key + (index > 0 ? (QString(".") + QString::number(index)) : QString()),
-            _account->id());
-
-        QKeychain::WritePasswordJob *job = new QKeychain::WritePasswordJob(_serviceName);
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
-        addSettingsToJob(_account, job);
-#endif
-        job->setInsecureFallback(_insecureFallback);
-        connect(job, &QKeychain::Job::finished, this, &KeychainChunk::WriteJob::slotWriteJobDone);
-        // only add the key's (sub)"index" after the first element, to stay compatible with older versions and non-Windows
-        job->setKey(kck);
-        job->setBinaryData(chunk);
-        job->start();
-
-        chunk.clear();
-    } else {
-        emit finished(this);
-    }
-
-    writeJob->deleteLater();
-}
-
-/*
-* ReadJob
-*/
-ReadJob::ReadJob(Account *account, const QString &key, const bool &keychainMigration, QObject *parent)
-    : Job(parent)
-{
-    _account = account;
-    _key = key;
-
-    _keychainMigration = keychainMigration;
-
-    _chunkCount = 0;
-    _chunkBuffer.clear();
-}
-
-void ReadJob::start()
-{
-    _chunkCount = 0;
-    _chunkBuffer.clear();
-
-    const QString kck = AbstractCredentials::keychainKey(
-        _account->url().toString(),
-        _key,
-        _keychainMigration ? QString() : _account->id());
-
-    QKeychain::ReadPasswordJob *job = new QKeychain::ReadPasswordJob(_serviceName);
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
-    addSettingsToJob(_account, job);
-#endif
-    job->setInsecureFallback(_insecureFallback);
-    job->setKey(kck);
-    connect(job, &QKeychain::Job::finished, this, &KeychainChunk::ReadJob::slotReadJobDone);
-    job->start();
-}
-
-void ReadJob::slotReadJobDone(QKeychain::Job *incomingJob)
-{
-    // Errors or next chunk?
-    QKeychain::ReadPasswordJob *readJob = static_cast<QKeychain::ReadPasswordJob *>(incomingJob);
-
-    if (readJob) {
-        if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
-            _chunkBuffer.append(readJob->binaryData());
-            _chunkCount++;
-
-#if defined(Q_OS_WIN)
-            // try to fetch next chunk
-            if (_chunkCount < KeychainChunk::MaxChunks) {
-                const QString kck = AbstractCredentials::keychainKey(
-                    _account->url().toString(),
-                    _key + QString(".") + QString::number(_chunkCount),
-                    _keychainMigration ? QString() : _account->id());
-
-                QKeychain::ReadPasswordJob *job = new QKeychain::ReadPasswordJob(_serviceName);
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
-                addSettingsToJob(_account, job);
-#endif
-                job->setInsecureFallback(_insecureFallback);
-                job->setKey(kck);
-                connect(job, &QKeychain::Job::finished, this, &KeychainChunk::ReadJob::slotReadJobDone);
-                job->start();
-
-                readJob->deleteLater();
-                return;
-            } else {
-                qCWarning(lcKeychainChunk) << "Maximum chunk count for" << readJob->key() << "reached, ignoring after" << KeychainChunk::MaxChunks;
-            }
-#endif
-        } else {
-            if (readJob->error() != QKeychain::Error::EntryNotFound ||
-                ((readJob->error() == QKeychain::Error::EntryNotFound) && _chunkCount == 0)) {
-                _error = readJob->error();
-                _errorString = readJob->errorString();
-                qCWarning(lcKeychainChunk) << "Unable to read" << readJob->key() << "chunk" << QString::number(_chunkCount) << readJob->errorString();
-            }
-        }
-
-        readJob->deleteLater();
-    }
-
-    emit finished(this);
-}
-
-} // namespace KeychainChunk
-
-} // namespace OCC
--- a/src/gui/creds/keychainchunk.h
+++ b/src/gui/creds/keychainchunk.h
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) by Michael Schuster <michael@nextcloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#pragma once
-#ifndef KEYCHAINCHUNK_H
-#define KEYCHAINCHUNK_H
-
-#include <QObject>
-#include <keychain.h>
-#include "accountfwd.h"
-
-// We don't support insecure fallback
-// #define KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK
-
-namespace OCC {
-
-namespace KeychainChunk {
-
-/*
-* Workaround for Windows:
-*
-* Split the keychain entry's data into chunks of 2048 bytes,
-* to allow 4k (4096 bit) keys / large certs to be saved (see limits in webflowcredentials.h)
-*/
-static constexpr int ChunkSize = 2048;
-static constexpr int MaxChunks = 10;
-
-/*
- * @brief: Abstract base class for KeychainChunk jobs.
- */
-class Job : public QObject {
-    Q_OBJECT
-public:
-    Job(QObject *parent = nullptr);
-
-    const QKeychain::Error error() const {
-        return _error;
-    }
-    const QString errorString() const {
-        return _errorString;
-    }
-
-    QByteArray binaryData() const {
-        return _chunkBuffer;
-    }
-
-    const bool insecureFallback() const {
-        return _insecureFallback;
-    }
-
-// If we use it but don't support insecure fallback, give us nice compilation errors ;p
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
-    void setInsecureFallback(const bool &insecureFallback)
-    {
-        _insecureFallback = insecureFallback;
-    }
-#endif
-
-protected:
-    QString _serviceName;
-    Account *_account;
-    QString _key;
-    bool _insecureFallback = false;
-    bool _keychainMigration = false;
-
-    QKeychain::Error _error = QKeychain::NoError;
-    QString _errorString;
-
-    int _chunkCount = 0;
-    QByteArray _chunkBuffer;
-}; // class Job
-
-/*
-* @brief: Simple wrapper class for QKeychain::WritePasswordJob, splits too large keychain entry's data into chunks on Windows
-*/
-class WriteJob : public KeychainChunk::Job {
-    Q_OBJECT
-public:
-    WriteJob(Account *account, const QString &key, const QByteArray &data, QObject *parent = nullptr);
-    void start();
-
-signals:
-    void finished(KeychainChunk::WriteJob *incomingJob);
-
-private slots:
-    void slotWriteJobDone(QKeychain::Job *incomingJob);
-}; // class WriteJob
-
-/*
-* @brief: Simple wrapper class for QKeychain::ReadPasswordJob, splits too large keychain entry's data into chunks on Windows
-*/
-class ReadJob : public KeychainChunk::Job {
-    Q_OBJECT
-public:
-    ReadJob(Account *account, const QString &key, const bool &keychainMigration, QObject *parent = nullptr);
-    void start();
-
-signals:
-    void finished(KeychainChunk::ReadJob *incomingJob);
-
-private slots:
-    void slotReadJobDone(QKeychain::Job *incomingJob);
-}; // class ReadJob
-
-} // namespace KeychainChunk
-
-} // namespace OCC
-
-#endif // KEYCHAINCHUNK_H
--- a/src/gui/creds/webflowcredentials.cpp
+++ b/src/gui/creds/webflowcredentials.cpp
@@ -18,7 +18,6 @@
 #include "theme.h"
 #include "wizard/webview.h"
 #include "webflowcredentialsdialog.h"
-#include "keychainchunk.h"

 using namespace QKeychain;

@@ -76,7 +75,6 @@ private:
    QPointer<const WebFlowCredentials> _cred;
 };

-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
 static void addSettingsToJob(Account *account, QKeychain::Job *job)
 {
    Q_UNUSED(account)
@@ -84,7 +82,6 @@ static void addSettingsToJob(Account *account, QKeychain::Job *job)
    settings->setParent(job); // make the job parent to make setting deleted properly
    job->setSettings(settings.release());
 }
-#endif

 WebFlowCredentials::WebFlowCredentials()
    : _ready(false)
@@ -150,32 +147,25 @@ void WebFlowCredentials::fetchFromKeychain() {
 }

 void WebFlowCredentials::askFromUser() {
-    // Determine if the old flow has to be used (GS for now)
-    // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2
-    DetermineAuthTypeJob *job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
-    connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) {
-        // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
-        bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow);
+    // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
+    bool useFlow2 = (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0));

-        _askDialog = new WebFlowCredentialsDialog(_account, useFlow2);
+    _askDialog = new WebFlowCredentialsDialog(_account, useFlow2);

-        if (!useFlow2) {
-            QUrl url = _account->url();
-            QString path = url.path() + "/index.php/login/flow";
-            url.setPath(path);
-            _askDialog->setUrl(url);
-        }
+    if (!useFlow2) {
+        QUrl url = _account->url();
+        QString path = url.path() + "/index.php/login/flow";
+        url.setPath(path);
+        _askDialog->setUrl(url);
+    }

-        QString msg = tr("You have been logged out of %1 as user %2. Please login again")
-                .arg(_account->displayName(), _user);
-        _askDialog->setInfo(msg);
+    QString msg = tr("You have been logged out of %1 as user %2. Please login again")
+            .arg(_account->displayName(), _user);
+    _askDialog->setInfo(msg);

-        _askDialog->show();
+    _askDialog->show();

-        connect(_askDialog, &WebFlowCredentialsDialog::urlCatched, this, &WebFlowCredentials::slotAskFromUserCredentialsProvided);
-        connect(_askDialog, &WebFlowCredentialsDialog::onClose, this, &WebFlowCredentials::slotAskFromUserCancelled);
-    });
-    job->start();
+    connect(_askDialog, &WebFlowCredentialsDialog::urlCatched, this, &WebFlowCredentials::slotAskFromUserCredentialsProvided);

    qCDebug(lcWebFlowCredentials()) << "User needs to reauth!";
 }
@@ -209,18 +199,10 @@ void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user,
    emit asked();

    _askDialog->close();
-    _askDialog->deleteLater();
+    delete _askDialog;
    _askDialog = nullptr;
 }

-void WebFlowCredentials::slotAskFromUserCancelled() {
-    qCDebug(lcWebFlowCredentials()) << "User cancelled reauth!";
-
-    emit asked();
-
-    _askDialog->deleteLater();
-    _askDialog = nullptr;
-}

 bool WebFlowCredentials::stillValid(QNetworkReply *reply) {
    if (reply->error() != QNetworkReply::NoError) {
@@ -241,32 +223,33 @@ void WebFlowCredentials::persist() {

    // write cert if there is one
    if (!_clientSslCertificate.isNull()) {
-        auto *job = new KeychainChunk::WriteJob(_account,
-                                                _user + clientCertificatePEMC,
-                                                _clientSslCertificate.toPem());
-        connect(job, &KeychainChunk::WriteJob::finished, this, &WebFlowCredentials::slotWriteClientCertPEMJobDone);
+        WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
+        addSettingsToJob(_account, job);
+        job->setInsecureFallback(false);
+        connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteClientCertPEMJobDone);
+        job->setKey(keychainKey(_account->url().toString(), _user + clientCertificatePEMC, _account->id()));
+        job->setBinaryData(_clientSslCertificate.toPem());
        job->start();
    } else {
        // no cert, just write credentials
-        slotWriteClientCertPEMJobDone(nullptr);
+        slotWriteClientCertPEMJobDone();
    }
 }

-void WebFlowCredentials::slotWriteClientCertPEMJobDone(KeychainChunk::WriteJob *writeJob)
+void WebFlowCredentials::slotWriteClientCertPEMJobDone()
 {
-    if(writeJob)
-        writeJob->deleteLater();
-
    // write ssl key if there is one
    if (!_clientSslKey.isNull()) {
-        auto *job = new KeychainChunk::WriteJob(_account,
-                                                _user + clientKeyPEMC,
-                                                _clientSslKey.toPem());
-        connect(job, &KeychainChunk::WriteJob::finished, this, &WebFlowCredentials::slotWriteClientKeyPEMJobDone);
+        WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
+        addSettingsToJob(_account, job);
+        job->setInsecureFallback(false);
+        connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteClientKeyPEMJobDone);
+        job->setKey(keychainKey(_account->url().toString(), _user + clientKeyPEMC, _account->id()));
+        job->setBinaryData(_clientSslKey.toPem());
        job->start();
    } else {
        // no key, just write credentials
-        slotWriteClientKeyPEMJobDone(nullptr);
+        slotWriteClientKeyPEMJobDone();
    }
 }

@@ -281,7 +264,7 @@ void WebFlowCredentials::writeSingleClientCaCertPEM()

        // keep the limit
        if (index > (_clientSslCaCertificatesMaxCount - 1)) {
-            qCWarning(lcWebFlowCredentials) << "Maximum client CA cert count exceeded while writing slot" << QString::number(index) << "cutting off after" << QString::number(_clientSslCaCertificatesMaxCount) << "certs";
+            qCWarning(lcWebFlowCredentials) << "Maximum client CA cert count exceeded while writing slot" << QString::number(index) << "), cutting off after " << QString::number(_clientSslCaCertificatesMaxCount) << "certs";

            _clientSslCaCertificatesWriteQueue.clear();

@@ -289,21 +272,20 @@ void WebFlowCredentials::writeSingleClientCaCertPEM()
            return;
        }

-        auto *job = new KeychainChunk::WriteJob(_account,
-                                                _user + clientCaCertificatePEMC + QString::number(index),
-                                                cert.toPem());
-        connect(job, &KeychainChunk::WriteJob::finished, this, &WebFlowCredentials::slotWriteClientCaCertsPEMJobDone);
+        WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
+        addSettingsToJob(_account, job);
+        job->setInsecureFallback(false);
+        connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteClientCaCertsPEMJobDone);
+        job->setKey(keychainKey(_account->url().toString(), _user + clientCaCertificatePEMC + QString::number(index), _account->id()));
+        job->setBinaryData(cert.toPem());
        job->start();
    } else {
        slotWriteClientCaCertsPEMJobDone(nullptr);
    }
 }

-void WebFlowCredentials::slotWriteClientKeyPEMJobDone(KeychainChunk::WriteJob *writeJob)
+void WebFlowCredentials::slotWriteClientKeyPEMJobDone()
 {
-    if(writeJob)
-        writeJob->deleteLater();
-
    _clientSslCaCertificatesWriteQueue.clear();

    // write ca certs if there are any
@@ -318,16 +300,16 @@ void WebFlowCredentials::slotWriteClientKeyPEMJobDone(KeychainChunk::WriteJob *w
    }
 }

-void WebFlowCredentials::slotWriteClientCaCertsPEMJobDone(KeychainChunk::WriteJob *writeJob)
+void WebFlowCredentials::slotWriteClientCaCertsPEMJobDone(QKeychain::Job *incomingJob)
 {
    // errors / next ca cert?
-    if (writeJob && !_clientSslCaCertificates.isEmpty()) {
+    if (incomingJob && !_clientSslCaCertificates.isEmpty()) {
+        WritePasswordJob *writeJob = static_cast<WritePasswordJob *>(incomingJob);
+
        if (writeJob->error() != NoError) {
            qCWarning(lcWebFlowCredentials) << "Error while writing client CA cert" << writeJob->errorString();
        }

-        writeJob->deleteLater();
-
        if (!_clientSslCaCertificatesWriteQueue.isEmpty()) {
            // next ca cert
            writeSingleClientCaCertPEM();
@@ -337,9 +319,7 @@ void WebFlowCredentials::slotWriteClientCaCertsPEMJobDone(KeychainChunk::WriteJo

    // done storing ca certs, time for the password
    WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
    addSettingsToJob(_account, job);
-#endif
    job->setInsecureFallback(false);
    connect(job, &Job::finished, this, &WebFlowCredentials::slotWriteJobDone);
    job->setKey(keychainKey(_account->url().toString(), _user, _account->id()));
@@ -378,8 +358,6 @@ void WebFlowCredentials::forgetSensitiveData() {

    fetchUser();

-    _account->deleteAppPassword();
-
    const QString kck = keychainKey(_account->url().toString(), _user, _account->id());
    if (kck.isEmpty()) {
        qCDebug(lcWebFlowCredentials()) << "InvalidateToken: User is empty, bailing out!";
@@ -389,15 +367,18 @@ void WebFlowCredentials::forgetSensitiveData() {
    DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName());
    job->setInsecureFallback(false);
    job->setKey(kck);
-    connect(job, &Job::finished, this, [](QKeychain::Job *job) {
-        DeletePasswordJob *djob = qobject_cast<DeletePasswordJob *>(job);
-        djob->deleteLater();
-    });
    job->start();

    invalidateToken();

-    deleteKeychainEntries();
+    /* IMPORTANT
+    /* TODO: For "Log out" & "Remove account": Remove client CA certs and KEY!
+     *
+     *       Disabled as long as selecting another cert is not supported by the UI.
+     *
+     *       Being able to specify a new certificate is important anyway: expiry etc.
+    */
+    //deleteKeychainEntries();
 }

 void WebFlowCredentials::setAccount(Account *account) {
@@ -435,31 +416,34 @@ void WebFlowCredentials::slotFinished(QNetworkReply *reply) {

    if (reply->error() == QNetworkReply::NoError) {
        _credentialsValid = true;
-
-        /// Used later for remote wipe
-        _account->writeAppPasswordOnce(_password);
    }
 }

 void WebFlowCredentials::fetchFromKeychainHelper() {
    // Read client cert from keychain
-    auto *job = new KeychainChunk::ReadJob(_account,
-                                           _user + clientCertificatePEMC,
-                                           _keychainMigration);
-    connect(job, &KeychainChunk::ReadJob::finished, this, &WebFlowCredentials::slotReadClientCertPEMJobDone);
+    const QString kck = keychainKey(
+        _account->url().toString(),
+        _user + clientCertificatePEMC,
+        _keychainMigration ? QString() : _account->id());
+
+    ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
+    addSettingsToJob(_account, job);
+    job->setInsecureFallback(false);
+    job->setKey(kck);
+    connect(job, &Job::finished, this, &WebFlowCredentials::slotReadClientCertPEMJobDone);
    job->start();
 }

-void WebFlowCredentials::slotReadClientCertPEMJobDone(KeychainChunk::ReadJob *readJob)
+void WebFlowCredentials::slotReadClientCertPEMJobDone(QKeychain::Job *incomingJob)
 {
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-    Q_ASSERT(!readJob->insecureFallback()); // If insecureFallback is set, the next test would be pointless
-    if (_retryOnKeyChainError && (readJob->error() == QKeychain::NoBackendAvailable
-            || readJob->error() == QKeychain::OtherError)) {
+    Q_ASSERT(!incomingJob->insecureFallback()); // If insecureFallback is set, the next test would be pointless
+    if (_retryOnKeyChainError && (incomingJob->error() == QKeychain::NoBackendAvailable
+            || incomingJob->error() == QKeychain::OtherError)) {
        // Could be that the backend was not yet available. Wait some extra seconds.
        // (Issues #4274 and #6522)
        // (For kwallet, the error is OtherError instead of NoBackendAvailable, maybe a bug in QtKeychain)
-        qCInfo(lcWebFlowCredentials) << "Backend unavailable (yet?) Retrying in a few seconds." << readJob->errorString();
+        qCInfo(lcWebFlowCredentials) << "Backend unavailable (yet?) Retrying in a few seconds." << incomingJob->errorString();
        QTimer::singleShot(10000, this, &WebFlowCredentials::fetchFromKeychainHelper);
        _retryOnKeyChainError = false;
        return;
@@ -468,6 +452,7 @@ void WebFlowCredentials::slotReadClientCertPEMJobDone(KeychainChunk::ReadJob *re
 #endif

    // Store PEM in memory
+    ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incomingJob);
    if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
        QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(readJob->binaryData(), QSsl::Pem);
        if (sslCertificateList.length() >= 1) {
@@ -475,19 +460,25 @@ void WebFlowCredentials::slotReadClientCertPEMJobDone(KeychainChunk::ReadJob *re
        }
    }

-    readJob->deleteLater();
-
    // Load key too
-    auto *job = new KeychainChunk::ReadJob(_account,
-                                           _user + clientKeyPEMC,
-                                           _keychainMigration);
-    connect(job, &KeychainChunk::ReadJob::finished, this, &WebFlowCredentials::slotReadClientKeyPEMJobDone);
+    const QString kck = keychainKey(
+        _account->url().toString(),
+        _user + clientKeyPEMC,
+        _keychainMigration ? QString() : _account->id());
+
+    ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
+    addSettingsToJob(_account, job);
+    job->setInsecureFallback(false);
+    job->setKey(kck);
+    connect(job, &Job::finished, this, &WebFlowCredentials::slotReadClientKeyPEMJobDone);
    job->start();
 }

-void WebFlowCredentials::slotReadClientKeyPEMJobDone(KeychainChunk::ReadJob *readJob)
+void WebFlowCredentials::slotReadClientKeyPEMJobDone(QKeychain::Job *incomingJob)
 {
    // Store key in memory
+    ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incomingJob);
+
    if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
        QByteArray clientKeyPEM = readJob->binaryData();
        // FIXME Unfortunately Qt has a bug and we can't just use QSsl::Opaque to let it
@@ -502,13 +493,8 @@ void WebFlowCredentials::slotReadClientKeyPEMJobDone(KeychainChunk::ReadJob *rea
        if (_clientSslKey.isNull()) {
            qCWarning(lcWebFlowCredentials) << "Could not load SSL key into Qt!";
        }
-        clientKeyPEM.clear();
-    } else {
-        qCWarning(lcWebFlowCredentials) << "Unable to read client key" << readJob->errorString();
    }

-    readJob->deleteLater();
-
    // Start fetching client CA certs
    _clientSslCaCertificates.clear();

@@ -519,20 +505,28 @@ void WebFlowCredentials::readSingleClientCaCertPEM()
 {
    // try to fetch a client ca cert
    if (_clientSslCaCertificates.count() < _clientSslCaCertificatesMaxCount) {
-        auto *job = new KeychainChunk::ReadJob(_account,
-                                               _user + clientCaCertificatePEMC + QString::number(_clientSslCaCertificates.count()),
-                                               _keychainMigration);
-        connect(job, &KeychainChunk::ReadJob::finished, this, &WebFlowCredentials::slotReadClientCaCertsPEMJobDone);
+        const QString kck = keychainKey(
+            _account->url().toString(),
+            _user + clientCaCertificatePEMC + QString::number(_clientSslCaCertificates.count()),
+            _keychainMigration ? QString() : _account->id());
+
+        ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
+        addSettingsToJob(_account, job);
+        job->setInsecureFallback(false);
+        job->setKey(kck);
+        connect(job, &Job::finished, this, &WebFlowCredentials::slotReadClientCaCertsPEMJobDone);
        job->start();
    } else {
-        qCWarning(lcWebFlowCredentials) << "Maximum client CA cert count exceeded while reading, ignoring after" << _clientSslCaCertificatesMaxCount;
+        qCWarning(lcWebFlowCredentials) << "Maximum client CA cert count exceeded while reading, ignoring after " << _clientSslCaCertificatesMaxCount;

        slotReadClientCaCertsPEMJobDone(nullptr);
    }
 }

-void WebFlowCredentials::slotReadClientCaCertsPEMJobDone(KeychainChunk::ReadJob *readJob) {
-    // Store cert in memory
+void WebFlowCredentials::slotReadClientCaCertsPEMJobDone(QKeychain::Job *incomingJob) {
+    // Store key in memory
+    ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incomingJob);
+
    if (readJob) {
        if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
            QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(readJob->binaryData(), QSsl::Pem);
@@ -540,19 +534,15 @@ void WebFlowCredentials::slotReadClientCaCertsPEMJobDone(KeychainChunk::ReadJob
                _clientSslCaCertificates.append(sslCertificateList.at(0));
            }

-            readJob->deleteLater();
-
            // try next cert
            readSingleClientCaCertPEM();
            return;
        } else {
            if (readJob->error() != QKeychain::Error::EntryNotFound ||
-                ((readJob->error() == QKeychain::Error::EntryNotFound) && _clientSslCaCertificates.count() == 0)) {
-                qCWarning(lcWebFlowCredentials) << "Unable to read client CA cert slot" << QString::number(_clientSslCaCertificates.count()) << readJob->errorString();
+                (readJob->error() == QKeychain::Error::EntryNotFound) && _clientSslCaCertificates.count() == 0) {
+                qCWarning(lcWebFlowCredentials) << "Unable to read client CA cert slot " << QString::number(_clientSslCaCertificates.count()) << readJob->errorString();
            }
        }
-
-        readJob->deleteLater();
    }

    // Now fetch the actual server password
@@ -562,9 +552,7 @@ void WebFlowCredentials::slotReadClientCaCertsPEMJobDone(KeychainChunk::ReadJob
        _keychainMigration ? QString() : _account->id());

    ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
    addSettingsToJob(_account, job);
-#endif
    job->setInsecureFallback(false);
    job->setKey(kck);
    connect(job, &Job::finished, this, &WebFlowCredentials::slotReadPasswordJobDone);
@@ -572,7 +560,7 @@ void WebFlowCredentials::slotReadClientCaCertsPEMJobDone(KeychainChunk::ReadJob
 }

 void WebFlowCredentials::slotReadPasswordJobDone(Job *incomingJob) {
-    QKeychain::ReadPasswordJob *job = qobject_cast<ReadPasswordJob *>(incomingJob);
+    QKeychain::ReadPasswordJob *job = static_cast<ReadPasswordJob *>(incomingJob);
    QKeychain::Error error = job->error();

    // If we could not find the entry try the old entries
@@ -595,8 +583,6 @@ void WebFlowCredentials::slotReadPasswordJobDone(Job *incomingJob) {
    }
    emit fetched();

-    job->deleteLater();
-
    // If keychain data was read from legacy location, wipe these entries and store new ones
    if (_keychainMigration && _ready) {
        _keychainMigration = false;
@@ -607,60 +593,23 @@ void WebFlowCredentials::slotReadPasswordJobDone(Job *incomingJob) {
 }

 void WebFlowCredentials::deleteKeychainEntries(bool oldKeychainEntries) {
-    auto startDeleteJob = [this, oldKeychainEntries](QString key) {
+    auto startDeleteJob = [this, oldKeychainEntries](QString user) {
        DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName());
-#if defined(KEYCHAINCHUNK_ENABLE_INSECURE_FALLBACK)
        addSettingsToJob(_account, job);
-#endif
-        job->setInsecureFallback(false);
+        job->setInsecureFallback(true);
        job->setKey(keychainKey(_account->url().toString(),
-                                key,
+                                user,
                                oldKeychainEntries ? QString() : _account->id()));
-
-        connect(job, &Job::finished, this, [](QKeychain::Job *job) {
-            DeletePasswordJob *djob = qobject_cast<DeletePasswordJob *>(job);
-            djob->deleteLater();
-        });
        job->start();
    };

    startDeleteJob(_user);
+    startDeleteJob(_user + clientKeyPEMC);
+    startDeleteJob(_user + clientCertificatePEMC);

-    /* IMPORTANT - remove later - FIXME MS@2019-12-07 -->
-      * TODO: For "Log out" & "Remove account": Remove client CA certs and KEY!
-      *
-      *       Disabled as long as selecting another cert is not supported by the UI.
-      *
-      *       Being able to specify a new certificate is important anyway: expiry etc.
-      *
-      *       We introduce this dirty hack here, to allow deleting them upon Remote Wipe.
-     */
-    if(_account->isRemoteWipeRequested_HACK()) {
-    // <-- FIXME MS@2019-12-07
-        startDeleteJob(_user + clientKeyPEMC);
-        startDeleteJob(_user + clientCertificatePEMC);
-
-        for (auto i = 0; i < _clientSslCaCertificates.count(); i++) {
-            startDeleteJob(_user + clientCaCertificatePEMC + QString::number(i));
-        }
-
-#if defined(Q_OS_WIN)
-        // Also delete key / cert sub-chunks (Windows workaround)
-        // The first chunk (0) has no suffix, to stay compatible with older versions and non-Windows
-        for (auto chunk = 1; chunk < KeychainChunk::MaxChunks; chunk++) {
-            const QString strChunkSuffix = QString(".") + QString::number(chunk);
-
-            startDeleteJob(_user + clientKeyPEMC + strChunkSuffix);
-            startDeleteJob(_user + clientCertificatePEMC + strChunkSuffix);
-
-            for (auto i = 0; i < _clientSslCaCertificates.count(); i++) {
-                startDeleteJob(_user + clientCaCertificatePEMC + QString::number(i));
-            }
-        }
-#endif
-    // FIXME MS@2019-12-07 -->
+    for (auto i = 0; i < _clientSslCaCertificates.count(); i++) {
+        startDeleteJob(_user + clientCaCertificatePEMC + QString::number(i));
    }
-    // <-- FIXME MS@2019-12-07
 }

-} // namespace OCC
+}
--- a/src/gui/creds/webflowcredentials.h
+++ b/src/gui/creds/webflowcredentials.h
@@ -19,11 +19,6 @@ namespace QKeychain {

 namespace OCC {

-namespace KeychainChunk {
-    class ReadJob;
-    class WriteJob;
-}
-
 class WebFlowCredentialsDialog;

 class WebFlowCredentials : public AbstractCredentials
@@ -66,16 +61,15 @@ private slots:
    void slotFinished(QNetworkReply *reply);

    void slotAskFromUserCredentialsProvided(const QString &user, const QString &pass, const QString &host);
-    void slotAskFromUserCancelled();

-    void slotReadClientCertPEMJobDone(KeychainChunk::ReadJob *readJob);
-    void slotReadClientKeyPEMJobDone(KeychainChunk::ReadJob *readJob);
-    void slotReadClientCaCertsPEMJobDone(KeychainChunk::ReadJob *readJob);
+    void slotReadClientCertPEMJobDone(QKeychain::Job *incomingJob);
+    void slotReadClientKeyPEMJobDone(QKeychain::Job *incomingJob);
+    void slotReadClientCaCertsPEMJobDone(QKeychain::Job *incommingJob);
    void slotReadPasswordJobDone(QKeychain::Job *incomingJob);

-    void slotWriteClientCertPEMJobDone(KeychainChunk::WriteJob *writeJob);
-    void slotWriteClientKeyPEMJobDone(KeychainChunk::WriteJob *writeJob);
-    void slotWriteClientCaCertsPEMJobDone(KeychainChunk::WriteJob *writeJob);
+    void slotWriteClientCertPEMJobDone();
+    void slotWriteClientKeyPEMJobDone();
+    void slotWriteClientCaCertsPEMJobDone(QKeychain::Job *incomingJob);
    void slotWriteJobDone(QKeychain::Job *);

 private:
@@ -89,7 +83,7 @@ private:
    void writeSingleClientCaCertPEM();

    /*
-     * Since we're limited by Windows limits, we just create our own
+     * Since we're limited by Windows limits we just create our own
     * limit to avoid evil things happening by endless recursion
     *
     * Better than storing the count and relying on maybe-hacked values
@@ -127,6 +121,6 @@ protected:
    WebFlowCredentialsDialog *_askDialog;
 };

-} // namespace OCC
+}

 #endif // WEBFLOWCREDENTIALS_H
--- a/src/gui/creds/webflowcredentialsdialog.cpp
+++ b/src/gui/creds/webflowcredentialsdialog.cpp
@@ -4,9 +4,6 @@
 #include <QLabel>

 #include "theme.h"
-#include "application.h"
-#include "owncloudgui.h"
-#include "headerbanner.h"
 #include "wizard/owncloudwizardcommon.h"
 #include "wizard/webview.h"
 #include "wizard/flow2authwidget.h"
@@ -22,59 +19,31 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlo
    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

    _layout = new QVBoxLayout(this);
-    int spacing = _layout->spacing();
-    int margin = _layout->margin();
-    _layout->setSpacing(0);
-    _layout->setMargin(0);
-
-    if(_useFlow2) {
-        _headerBanner = new HeaderBanner(this);
-        _layout->addWidget(_headerBanner);
-        Theme *theme = Theme::instance();
-        _headerBanner->setup(tr("Log in"), theme->wizardHeaderLogo(), theme->wizardHeaderBanner(),
-                             Qt::AutoText, QString::fromLatin1("color:#fff;"));
-    }
-
-    _containerLayout = new QVBoxLayout(this);
-    _containerLayout->setSpacing(spacing);
-    _containerLayout->setMargin(margin);

+    //QString msg = tr("You have been logged out of %1 as user %2, please login again")
+    //        .arg(_account->displayName(), _user);
    _infoLabel = new QLabel();
-    _containerLayout->addWidget(_infoLabel);
+    _layout->addWidget(_infoLabel);

    if (_useFlow2) {
-        _flow2AuthWidget = new Flow2AuthWidget();
-        _containerLayout->addWidget(_flow2AuthWidget);
+        _flow2AuthWidget = new Flow2AuthWidget(account);
+        _layout->addWidget(_flow2AuthWidget);

-        connect(_flow2AuthWidget, &Flow2AuthWidget::authResult, this, &WebFlowCredentialsDialog::slotFlow2AuthResult);
-
-        // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
-        connect(this, &WebFlowCredentialsDialog::styleChanged, _flow2AuthWidget, &Flow2AuthWidget::slotStyleChanged);
-
-        // allow Flow2 page to poll on window activation
-        connect(this, &WebFlowCredentialsDialog::onActivate, _flow2AuthWidget, &Flow2AuthWidget::slotPollNow);
-
-        _flow2AuthWidget->startAuth(account);
+        connect(_flow2AuthWidget, &Flow2AuthWidget::urlCatched, this, &WebFlowCredentialsDialog::urlCatched);
    } else {
        _webView = new WebView();
-        _containerLayout->addWidget(_webView);
+        _layout->addWidget(_webView);

        connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched);
    }

-    auto app = static_cast<Application *>(qApp);
-    connect(app, &Application::isShowingSettingsDialog, this, &WebFlowCredentialsDialog::slotShowSettingsDialog);
-
    _errorLabel = new QLabel();
    _errorLabel->hide();
-    _containerLayout->addWidget(_errorLabel);
+    _layout->addWidget(_errorLabel);

    WizardCommon::initErrorLabel(_errorLabel);

-    _layout->addLayout(_containerLayout);
    setLayout(_layout);
-
-    customizeStyle();
 }

 void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) {
@@ -83,17 +52,11 @@ void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) {
    if (_webView) {
        // Force calling WebView::~WebView() earlier so that _profile and _page are
        // deleted in the correct order.
-        _webView->deleteLater();
-        _webView = nullptr;
+        delete _webView;
    }

-    if (_flow2AuthWidget) {
-        _flow2AuthWidget->resetAuth();
-        _flow2AuthWidget->deleteLater();
-        _flow2AuthWidget = nullptr;
-    }
-
-    emit onClose();
+    if (_flow2AuthWidget)
+        delete _flow2AuthWidget;
 }

 void WebFlowCredentialsDialog::setUrl(const QUrl &url) {
@@ -106,9 +69,6 @@ void WebFlowCredentialsDialog::setInfo(const QString &msg) {
 }

 void WebFlowCredentialsDialog::setError(const QString &error) {
-    // bring window to top
-    slotShowSettingsDialog();
-
    if (_useFlow2 && _flow2AuthWidget) {
        _flow2AuthWidget->setError(error);
        return;
@@ -122,49 +82,4 @@ void WebFlowCredentialsDialog::setError(const QString &error) {
    }
 }

-void WebFlowCredentialsDialog::changeEvent(QEvent *e)
-{
-    switch (e->type()) {
-    case QEvent::StyleChange:
-    case QEvent::PaletteChange:
-    case QEvent::ThemeChange:
-        customizeStyle();
-
-        // Notify the other widgets (Dark-/Light-Mode switching)
-        emit styleChanged();
-        break;
-    case QEvent::ActivationChange:
-        if(isActiveWindow())
-            emit onActivate();
-        break;
-    default:
-        break;
-    }
-
-    QDialog::changeEvent(e);
 }
-
-void WebFlowCredentialsDialog::customizeStyle()
-{
-    // HINT: Customize dialog's own style here, if necessary in the future (Dark-/Light-Mode switching)
-}
-
-void WebFlowCredentialsDialog::slotShowSettingsDialog()
-{
-    // bring window to top but slightly delay, to avoid being hidden behind the SettingsDialog
-    QTimer::singleShot(100, this, [this] {
-        ownCloudGui::raiseDialog(this);
-    });
-}
-
-void WebFlowCredentialsDialog::slotFlow2AuthResult(Flow2Auth::Result r, const QString &errorString, const QString &user, const QString &appPassword)
-{
-    if(r == Flow2Auth::LoggedIn) {
-        emit urlCatched(user, appPassword, QString());
-    } else {
-        // bring window to top
-        slotShowSettingsDialog();
-    }
-}
-
-} // namespace OCC
--- a/src/gui/creds/webflowcredentialsdialog.h
+++ b/src/gui/creds/webflowcredentialsdialog.h
@@ -5,14 +5,12 @@
 #include <QUrl>

 #include "accountfwd.h"
-#include "creds/flow2auth.h"

 class QLabel;
 class QVBoxLayout;

 namespace OCC {

-class HeaderBanner;
 class WebView;
 class Flow2AuthWidget;

@@ -32,21 +30,11 @@ public:

 protected:
    void closeEvent(QCloseEvent * e) override;
-    void changeEvent(QEvent *) override;
-
-public slots:
-    void slotFlow2AuthResult(Flow2Auth::Result, const QString &errorString, const QString &user, const QString &appPassword);
-    void slotShowSettingsDialog();

 signals:
    void urlCatched(const QString user, const QString pass, const QString host);
-    void styleChanged();
-    void onActivate();
-    void onClose();

 private:
-    void customizeStyle();
-
    bool _useFlow2;

    Flow2AuthWidget *_flow2AuthWidget;
@@ -55,10 +43,8 @@ private:
    QLabel *_errorLabel;
    QLabel *_infoLabel;
    QVBoxLayout *_layout;
-    QVBoxLayout *_containerLayout;
-    HeaderBanner *_headerBanner;
 };

-} // namespace OCC
+}

 #endif // WEBFLOWCREDENTIALSDIALOG_H
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -417,13 +417,6 @@ void Folder::createGuiLog(const QString &filename, LogStatus status, int count,
                text = tr("%1 could not be synced due to an error. See the log for details.").arg(file);
            }
            break;
-        case LogStatusFileLocked:
-            if (count > 1) {
-                text = tr("%1 and %n other file(s) are currently locked.", "", count -1).arg(file);
-            } else {
-                text = tr("%1 is currently locked.").arg(file);
-            }
-            break;
        }

        if (!text.isEmpty()) {
@@ -902,19 +895,13 @@ void Folder::slotItemCompleted(const SyncFileItemPtr &item)
    }

    // add new directories or remove gone away dirs to the watcher
-    if (_folderWatcher && item->isDirectory()) {
-	switch (item->_instruction) {
-	    case CSYNC_INSTRUCTION_NEW:
-                _folderWatcher->addPath(path() + item->_file);
-	    break;
-	    case CSYNC_INSTRUCTION_REMOVE:
-                _folderWatcher->removePath(path() + item->_file);
-	    break;
-	    case CSYNC_INSTRUCTION_RENAME:
-                _folderWatcher->removePath(path() + item->_file);
-                _folderWatcher->addPath(path() + item->destination());
-	    break;
-	}
+    if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_NEW) {
+        if (_folderWatcher)
+            _folderWatcher->addPath(path() + item->_file);
+    }
+    if (item->isDirectory() && item->_instruction == CSYNC_INSTRUCTION_REMOVE) {
+        if (_folderWatcher)
+            _folderWatcher->removePath(path() + item->_file);
    }

    // Success and failure of sync items adjust what the next sync is
@@ -1085,7 +1072,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel
    if (!cfgFile.promptDeleteFiles())
        return;

-    QString msg = dir == SyncFileItem::Down ? tr("All files in the sync folder '%1' were deleted on the server.\n"
+    QString msg = dir == SyncFileItem::Down ? tr("All files in the sync folder '%1' folder were deleted on the server.\n"
                                                 "These deletes will be synchronized to your local sync folder, making such files "
                                                 "unavailable unless you have a right to restore. \n"
                                                 "If you decide to restore the files, they will be re-synced with the server if you have rights to do so.\n"
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -75,7 +75,7 @@ FolderMan::FolderMan(QObject *parent)
        this, &FolderMan::slotScheduleFolderByTime);
    _timeScheduler.start();

-    connect(AccountManager::instance(), &AccountManager::removeAccountFolders,
+    connect(AccountManager::instance(), &AccountManager::accountRemoved,
        this, &FolderMan::slotRemoveFoldersForAccount);

    connect(_lockWatcher.data(), &LockWatcher::fileUnlocked,
@@ -443,7 +443,7 @@ void FolderMan::slotFolderSyncPaused(Folder *f, bool paused)
 void FolderMan::slotFolderCanSyncChanged()
 {
    Folder *f = qobject_cast<Folder *>(sender());
-     ASSERT(f);
+    ASSERT(f);
    if (f->canSync()) {
        _socketApi->slotRegisterPath(f->alias());
    } else {
@@ -562,7 +562,7 @@ void FolderMan::slotEtagJobDestroyed(QObject * /*o*/)
 void FolderMan::slotRunOneEtagJob()
 {
    if (_currentEtagJob.isNull()) {
-        Folder *folder = nullptr;
+        Folder *folder;
        foreach (Folder *f, _folderMap) {
            if (f->etagJob()) {
                // Caveat: always grabs the first folder with a job, but we think this is Ok for now and avoids us having a seperate queue.
@@ -1084,73 +1084,6 @@ bool FolderMan::startFromScratch(const QString &localFolder)
    return true;
 }

-void FolderMan::slotWipeFolderForAccount(AccountState *accountState)
-{
-    QVarLengthArray<Folder *, 16> foldersToRemove;
-    Folder::MapIterator i(_folderMap);
-    while (i.hasNext()) {
-        i.next();
-        Folder *folder = i.value();
-        if (folder->accountState() == accountState) {
-            foldersToRemove.append(folder);
-        }
-    }
-
-    bool success = false;
-    foreach (const auto &f, foldersToRemove) {
-        if (!f) {
-            qCCritical(lcFolderMan) << "Can not remove null folder";
-            return;
-        }
-
-        qCInfo(lcFolderMan) << "Removing " << f->alias();
-
-        const bool currentlyRunning = (_currentSyncFolder == f);
-        if (currentlyRunning) {
-            // abort the sync now
-            terminateSyncProcess();
-        }
-
-        if (_scheduledFolders.removeAll(f) > 0) {
-            emit scheduleQueueChanged();
-        }
-
-        // wipe database
-        f->wipe();
-
-        // wipe data
-        QDir userFolder(f->path());
-        if (userFolder.exists()) {
-            success = userFolder.removeRecursively();
-            if (!success) {
-                qCWarning(lcFolderMan) << "Failed to remove existing folder " << f->path();
-            } else {
-                qCInfo(lcFolderMan) << "wipe: Removed  file " << f->path();
-            }
-
-
-        } else {
-            success = true;
-            qCWarning(lcFolderMan) << "folder does not exist, can not remove.";
-        }
-
-        f->setSyncPaused(true);
-
-        // remove the folder configuration
-        f->removeFromSettings();
-
-        unloadFolder(f);
-        if (currentlyRunning) {
-            delete f;
-        }
-
-        _navigationPaneHelper.scheduleUpdateCloudStorageRegistry();
-    }
-
-    emit folderListChanged(_folderMap);
-    emit wipeDone(accountState, success);
-}
-
 void FolderMan::setDirtyProxy()
 {
    foreach (Folder *f, _folderMap.values()) {
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -207,11 +207,6 @@ signals:
     */
    void folderListChanged(const Folder::Map &);

-    /**
-     * Emitted once slotRemoveFoldersForAccount is done wiping
-     */
-    void wipeDone(AccountState *account, bool success);
-
 public slots:

    /**
@@ -236,9 +231,6 @@ public slots:
    // slot to schedule an ETag job (from Folder only)
    void slotScheduleETagJob(const QString &alias, RequestEtagJob *job);

-    /** Wipe folder */
-    void slotWipeFolderForAccount(AccountState *accountState);
-
 private slots:
    void slotFolderSyncPaused(Folder *, bool paused);
    void slotFolderCanSyncChanged();
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -40,7 +40,7 @@ namespace OCC {
 FolderStatusDelegate::FolderStatusDelegate()
    : QStyledItemDelegate()
 {
-    customizeStyle();
+    m_moreIcon = QIcon(QLatin1String(":/client/resources/more.svg"));
 }

 QString FolderStatusDelegate::addFolderText()
@@ -168,7 +168,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    QString itemString = qvariant_cast<QString>(index.data(SyncProgressItemString));
    int warningCount = qvariant_cast<int>(index.data(WarningCount));
    bool syncOngoing = qvariant_cast<bool>(index.data(SyncRunning));
-    QDateTime syncDate = qvariant_cast<QDateTime>(index.data(SyncDate));
    bool syncEnabled = qvariant_cast<bool>(index.data(FolderAccountConnected));

    QRect iconRect = option.rect;
@@ -253,7 +252,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
    if (!showProgess) {
        painter->setFont(subFont);
        QString elidedRemotePathText = subFm.elidedText(
-            tr("Synchronized with local folder (%1)").arg(syncDate.toTimeSpec(Qt::LocalTime).toString(Qt::SystemLocaleShortDate)),
+            tr("Synchronized with local folder"),
            Qt::ElideRight, remotePathRect.width());
        painter->drawText(QStyle::visualRect(option.direction, option.rect, remotePathRect),
            textAlign, elidedRemotePathText);
@@ -273,11 +272,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
        rect.setHeight(texts.count() * subFm.height() + 2 * margin);
        rect.setRight(option.rect.right() - margin);

-        // save previous state to not mess up colours with the background (fixes issue: https://github.com/nextcloud/desktop/issues/1237)
-        auto oldBrush = painter->brush();
-        auto oldPen = painter->pen();
-        auto oldFont = painter->font();
-
        painter->setBrush(color);
        painter->setPen(QColor(0xaa, 0xaa, 0xaa));
        painter->drawRoundedRect(QStyle::visualRect(option.direction, option.rect, rect),
@@ -295,11 +289,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
            textRect.translate(0, textRect.height());
        }

-        // restore previous state
-        painter->setBrush(oldBrush);
-        painter->setPen(oldPen);
-        painter->setFont(oldFont);
-
        h = rect.bottom() + margin;
    };

@@ -359,7 +348,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
        btnOpt.arrowType = Qt::NoArrow;
        btnOpt.subControls = QStyle::SC_ToolButton;
        btnOpt.rect = optionsButtonVisualRect;
-        btnOpt.icon = _iconMore;
+        btnOpt.icon = m_moreIcon;
        int e = QApplication::style()->pixelMetric(QStyle::PM_ButtonIconSize);
        btnOpt.iconSize = QSize(e,e);
        QApplication::style()->drawComplexControl(QStyle::CC_ToolButton, &btnOpt, painter);
@@ -433,14 +422,5 @@ QRect FolderStatusDelegate::errorsListRect(QRect within)
    return within;
 }

-void FolderStatusDelegate::slotStyleChanged()
-{
-    customizeStyle();
-}
-
-void FolderStatusDelegate::customizeStyle()
-{
-    _iconMore = Theme::createColorAwareIcon(QLatin1String(":/client/resources/more.svg"));
-}

 } // namespace OCC
--- a/src/gui/folderstatusdelegate.h
+++ b/src/gui/folderstatusdelegate.h
@@ -26,6 +26,7 @@ class FolderStatusDelegate : public QStyledItemDelegate
 {
    Q_OBJECT
 public:
+    QIcon m_moreIcon;
    FolderStatusDelegate();

    enum datarole { FolderAliasRole = Qt::UserRole + 100,
@@ -43,7 +44,6 @@ public:
        SyncProgressItemString,
        WarningCount,
        SyncRunning,
-        SyncDate,

        AddButton // 1 = enabled; 2 = disabled
    };
@@ -61,16 +61,9 @@ public:
    static QRect errorsListRect(QRect within);
    static int rootFolderHeightWithoutErrors(const QFontMetrics &fm, const QFontMetrics &aliasFm);

-public slots:
-    void slotStyleChanged();
-
 private:
-    void customizeStyle();
-
    static QString addFolderText();
    QPersistentModelIndex _pressedIndex;
-
-    QIcon _iconMore;
 };

 } // namespace OCC
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -186,7 +186,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
                return QVariant(tr("Error while loading the list of folders from the server.")
                    + QString("\n") + x->_lastErrorString);
            } else {
-                return tr("Fetching folder list from server …");
+                return tr("Fetching folder list from server...");
            }
            break;
        default:
@@ -218,8 +218,6 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
        return f->syncResult().errorStrings();
    case FolderStatusDelegate::SyncRunning:
        return f->syncResult().status() == SyncResult::SyncRunning;
-    case FolderStatusDelegate::SyncDate:
-        return f->syncResult().syncTime();
    case FolderStatusDelegate::HeaderRole:
        return f->shortGuiRemotePathOrAppName();
    case FolderStatusDelegate::FolderAliasRole:
@@ -1099,15 +1097,15 @@ void FolderStatusModel::slotFolderSyncStateChange(Folder *f)
        }
        QString message;
        if (pos <= 0) {
-            message = tr("Waiting …");
+            message = tr("Waiting...");
        } else {
-            message = tr("Waiting for %n other folder(s) …", "", pos);
+            message = tr("Waiting for %n other folder(s)...", "", pos);
        }
        pi = SubFolderInfo::Progress();
        pi._overallSyncString = message;
    } else if (state == SyncResult::SyncPrepare) {
        pi = SubFolderInfo::Progress();
-        pi._overallSyncString = tr("Preparing to sync …");
+        pi._overallSyncString = tr("Preparing to sync...");
    } else if (state == SyncResult::Problem || state == SyncResult::Success) {
        // Reset the progress info after a sync.
        pi = SubFolderInfo::Progress();
--- a/src/gui/folderwatcher_win.cpp
+++ b/src/gui/folderwatcher_win.cpp
@@ -19,8 +19,6 @@
 #include "folderwatcher.h"
 #include "folderwatcher_win.h"

-#include "common/utility.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <tchar.h>
@@ -54,7 +52,7 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,

    // QVarLengthArray ensures the stack-buffer is aligned like double and qint64.
    QVarLengthArray<char, 4096 * 10> fileNotifyBuffer;
-    fileNotifyBuffer.resize(OCC::Utility::convertSizeToInt(fileNotifyBufferSize));
+    fileNotifyBuffer.resize(fileNotifyBufferSize);

    const size_t fileNameBufferSize = 4096;
    TCHAR fileNameBuffer[fileNameBufferSize];
@@ -68,7 +66,7 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,
        DWORD dwBytesReturned = 0;
        SecureZeroMemory(pFileNotifyBuffer, fileNotifyBufferSize);
        if (!ReadDirectoryChangesW(_directory, (LPVOID)pFileNotifyBuffer,
-                OCC::Utility::convertSizeToDWORD(fileNotifyBufferSize), true,
+                fileNotifyBufferSize, true,
                FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_LAST_WRITE,
                &dwBytesReturned,
                &overlapped,
@@ -115,7 +113,7 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,
        FILE_NOTIFY_INFORMATION *curEntry = pFileNotifyBuffer;
        forever {
            size_t len = curEntry->FileNameLength / 2;
-            QString file = _path + "\\" + QString::fromWCharArray(curEntry->FileName, OCC::Utility::convertSizeToInt(len));
+            QString file = _path + "\\" + QString::fromWCharArray(curEntry->FileName, len);

            // Unless the file was removed or renamed, get its full long name
            // TODO: We could still try expanding the path in the tricky cases...
@@ -124,7 +122,7 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,
                && curEntry->Action != FILE_ACTION_RENAMED_OLD_NAME) {
                size_t longNameSize = GetLongPathNameW(reinterpret_cast<LPCWSTR>(file.utf16()), fileNameBuffer, fileNameBufferSize);
                if (longNameSize > 0) {
-                    longfile = QString::fromUtf16(reinterpret_cast<const ushort *>(fileNameBuffer), OCC::Utility::convertSizeToInt(longNameSize));
+                    longfile = QString::fromUtf16(reinterpret_cast<const ushort *>(fileNameBuffer), longNameSize);
                } else {
                    qCWarning(lcFolderWatcher) << "Error converting file name to full length, keeping original name.";
                }
--- a/src/gui/folderwizardtargetpage.ui
+++ b/src/gui/folderwizardtargetpage.ui
@@ -107,7 +107,7 @@
           <enum>QFrame::Plain</enum>
          </property>
          <property name="text">
-           <string notr="true">TextLabel</string>
+           <string>TextLabel</string>
          </property>
          <property name="textFormat">
           <enum>Qt::RichText</enum>
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -26,7 +26,6 @@
 #include "updater/updater.h"
 #include "updater/ocupdater.h"
 #include "ignorelisteditor.h"
-#include "common/utility.h"

 #include "config.h"

@@ -36,12 +35,6 @@
 #include <QDir>
 #include <QScopedValueRollback>

-#define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0))
-
-#if !(QTLEGACY)
-#include <QOperatingSystemVersion>
-#endif
-
 namespace OCC {

 GeneralSettings::GeneralSettings(QWidget *parent)
@@ -57,13 +50,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)

    connect(_ui->showInExplorerNavigationPaneCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotShowInExplorerNavigationPane);

-    // Rename 'Explorer' appropriately on non-Windows
-#ifdef Q_OS_MAC
-    QString txt = _ui->showInExplorerNavigationPaneCheckBox->text();
-    txt.replace(QString::fromLatin1("Explorer"), QString::fromLatin1("Finder"));
-    _ui->showInExplorerNavigationPaneCheckBox->setText(txt);
-#endif
-
    _ui->autostartCheckBox->setChecked(Utility::hasLaunchOnStartup(Theme::instance()->appName()));
    connect(_ui->autostartCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotToggleLaunchOnStartup);

@@ -77,8 +63,7 @@ GeneralSettings::GeneralSettings(QWidget *parent)
    connect(_ui->legalNoticeButton, &QPushButton::clicked, this, &GeneralSettings::slotShowLegalNotice);

    loadMiscSettings();
-    // updater info now set in: customizeStyle
-    //slotUpdateInfo();
+    slotUpdateInfo();

    // misc
    connect(_ui->monoIconsCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings);
@@ -94,13 +79,9 @@ GeneralSettings::GeneralSettings(QWidget *parent)
    // Hide on non-Windows, or WindowsVersion < 10.
    // The condition should match the default value of ConfigFile::showInExplorerNavigationPane.
 #ifdef Q_OS_WIN
-    #if QTLEGACY
-        if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10)
-    #else
-        if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows10)
-    #endif
-            _ui->showInExplorerNavigationPaneCheckBox->setVisible(false);
+    if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10)
 #endif
+        _ui->showInExplorerNavigationPaneCheckBox->setVisible(false);

    /* Set the left contents margin of the layout to zero to make the checkboxes
     * align properly vertically , fixes bug #3758
@@ -117,8 +98,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)

    // accountAdded means the wizard was finished and the wizard might change some options.
    connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings);
-
-    customizeStyle();
 }

 GeneralSettings::~GeneralSettings()
@@ -159,11 +138,7 @@ void GeneralSettings::slotUpdateInfo()
        connect(updater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
        connect(_ui->restartButton, &QAbstractButton::clicked, updater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
        connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
-
-        QString status = updater->statusString();
-        Theme::replaceLinkColorStringBackgroundAware(status);
-        _ui->updateStateLabel->setText(status);
-
+        _ui->updateStateLabel->setText(updater->statusString());
        _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
    } else {
        // can't have those infos from sparkle currently
@@ -225,20 +200,4 @@ void GeneralSettings::slotShowLegalNotice()
    delete notice;
 }

-void GeneralSettings::slotStyleChanged()
-{
-    customizeStyle();
-}
-
-void GeneralSettings::customizeStyle()
-{
-    // setup about section
-    QString about = Theme::instance()->about();
-    Theme::replaceLinkColorStringBackgroundAware(about);
-    _ui->aboutLabel->setText(about);
-
-    // updater info
-    slotUpdateInfo();
-}
-
 } // namespace OCC
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -39,9 +39,6 @@ public:
    ~GeneralSettings();
    QSize sizeHint() const override;

-public slots:
-    void slotStyleChanged();
-
 private slots:
    void saveMiscSettings();
    void slotToggleLaunchOnStartup(bool);
@@ -53,8 +50,6 @@ private slots:
    void slotShowLegalNotice();

 private:
-    void customizeStyle();
-
    Ui::GeneralSettings *_ui;
    QPointer<IgnoreListEditor> _ignoreEditor;
    QPointer<SyncLogDialog> _syncLogDialog;
--- a/src/gui/headerbanner.cpp
+++ b/src/gui/headerbanner.cpp
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) by Michael Schuster <michael@nextcloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-/****************************************************************************
-**
-** Based on Qt sourcecode:
-**   qt5/qtbase/src/widgets/dialogs/qwizard.cpp
-**
-** https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/dialogs/qwizard.cpp?h=v5.13.0
-**
-** Original license:
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "headerbanner.h"
-
-#include <QVBoxLayout>
-#include <QLabel>
-
-#include <QPainter>
-#include <QStyle>
-#include <QGuiApplication>
-
-namespace OCC {
-
-// These fudge terms were needed a few places to obtain pixel-perfect results
-const int GapBetweenLogoAndRightEdge = 5;
-const int ModernHeaderTopMargin = 2;
-
-HeaderBanner::HeaderBanner(QWidget *parent)
-    : QWidget(parent)
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    setBackgroundRole(QPalette::Base);
-    titleLabel = new QLabel(this);
-    titleLabel->setBackgroundRole(QPalette::Base);
-    logoLabel = new QLabel(this);
-    QFont font = titleLabel->font();
-    font.setBold(true);
-    titleLabel->setFont(font);
-    layout = new QGridLayout(this);
-    layout->setContentsMargins(QMargins());
-    layout->setSpacing(0);
-    layout->setRowMinimumHeight(3, 1);
-    layout->setRowStretch(4, 1);
-    layout->setColumnStretch(2, 1);
-    layout->setColumnMinimumWidth(4, 2 * GapBetweenLogoAndRightEdge);
-    layout->setColumnMinimumWidth(6, GapBetweenLogoAndRightEdge);
-    layout->addWidget(titleLabel, 1, 1, 5, 1);
-    layout->addWidget(logoLabel, 1, 5, 5, 1);
-}
-
-void HeaderBanner::setup(const QString &title, const QPixmap &logo, const QPixmap &banner,
-                         const Qt::TextFormat titleFormat, const QString &styleSheet)
-{
-    QStyle *style = parentWidget()->style();
-    //const int layoutHorizontalSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
-    int topLevelMarginLeft = style->pixelMetric(QStyle::PM_LayoutLeftMargin, 0, parentWidget());
-    int topLevelMarginRight = style->pixelMetric(QStyle::PM_LayoutRightMargin, 0, parentWidget());
-    int topLevelMarginTop = style->pixelMetric(QStyle::PM_LayoutTopMargin, 0, parentWidget());
-    //int topLevelMarginBottom = style->pixelMetric(QStyle::PM_LayoutBottomMargin, 0, parentWidget());
-
-    layout->setRowMinimumHeight(0, ModernHeaderTopMargin);
-    layout->setRowMinimumHeight(1, topLevelMarginTop - ModernHeaderTopMargin - 1);
-    layout->setRowMinimumHeight(6, 3);
-    int minColumnWidth0 = topLevelMarginLeft + topLevelMarginRight;
-    int minColumnWidth1 = topLevelMarginLeft + topLevelMarginRight + 1;
-    layout->setColumnMinimumWidth(0, minColumnWidth0);
-    layout->setColumnMinimumWidth(1, minColumnWidth1);
-    titleLabel->setTextFormat(titleFormat);
-    titleLabel->setText(title);
-    if(!styleSheet.isEmpty())
-        titleLabel->setStyleSheet(styleSheet);
-    logoLabel->setPixmap(logo);
-    bannerPixmap = banner;
-    if (bannerPixmap.isNull()) {
-        QSize size = layout->totalMinimumSize();
-        setMinimumSize(size);
-        setMaximumSize(QWIDGETSIZE_MAX, size.height());
-    } else {
-        setFixedHeight(banner.height() + 2);
-    }
-    updateGeometry();
-}
-
-void HeaderBanner::paintEvent(QPaintEvent * /* event */)
-{
-    QPainter painter(this);
-    painter.drawPixmap(0, 0, width(), bannerPixmap.height(), bannerPixmap);
-    int x = width() - 2;
-    int y = height() - 2;
-    const QPalette &pal = QGuiApplication::palette();
-    painter.setPen(pal.mid().color());
-    painter.drawLine(0, y, x, y);
-    painter.setPen(pal.base().color());
-    painter.drawPoint(x + 1, y);
-    painter.drawLine(0, y + 1, x + 1, y + 1);
-}
-
-} // namespace OCC
--- a/src/gui/headerbanner.h
+++ b/src/gui/headerbanner.h
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) by Michael Schuster <michael@nextcloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-/****************************************************************************
-**
-** Based on Qt sourcecode:
-**   qt5/qtbase/src/widgets/dialogs/qwizard.cpp
-**
-** https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/dialogs/qwizard.cpp?h=v5.13.0
-**
-** Original license:
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef HEADERBANNER_H
-#define HEADERBANNER_H
-
-#include <QWidget>
-
-class QLabel;
-class QGridLayout;
-class QPixmap;
-
-namespace OCC {
-
-class HeaderBanner : public QWidget
-{
-    Q_OBJECT
-public:
-    HeaderBanner(QWidget *parent = 0);
-
-    void setup(const QString &title, const QPixmap &logo, const QPixmap &banner,
-               const Qt::TextFormat titleFormat, const QString &styleSheet);
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-
-private:
-    QLabel *titleLabel;
-    QLabel *logoLabel;
-    QGridLayout *layout;
-    QPixmap bannerPixmap;
-};
-
-} // namespace OCC
-
-#endif // HEADERBANNER_H
--- a/src/gui/ignorelisttablewidget.ui
+++ b/src/gui/ignorelisttablewidget.ui
@@ -11,7 +11,7 @@
   </rect>
  </property>
  <property name="windowTitle">
-   <string notr="true">IgnoreListTableWidget</string>
+   <string>IgnoreListTableWidget</string>
  </property>
  <layout class="QGridLayout" name="gridLayout_2">
   <item row="0" column="0" rowspan="4">
--- a/src/gui/legalnotice.cpp
+++ b/src/gui/legalnotice.cpp
@@ -24,7 +24,7 @@ LegalNotice::LegalNotice(QDialog *parent)
 {
    _ui->setupUi(this);

-    QString notice = tr("<p>Copyright 2017-2019 Nextcloud GmbH<br />"
+    QString notice = tr("<p>Copyright 2017-2018 Nextcloud GmbH<br />"
                        "Copyright 2012-2018 ownCloud GmbH</p>");

    notice += tr("<p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p>");
--- a/src/gui/mnemonicdialog.ui
+++ b/src/gui/mnemonicdialog.ui
@@ -55,7 +55,7 @@
        </size>
       </property>
       <property name="text">
-        <string notr="true">Label</string>
+        <string>Label</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
--- a/src/gui/networksettings.ui
+++ b/src/gui/networksettings.ui
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>563</width>
-    <height>444</height>
+    <width>542</width>
+    <height>396</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -228,7 +228,7 @@
             <bool>false</bool>
            </property>
            <property name="maximum">
-             <number>999999</number>
+             <number>9999</number>
            </property>
            <property name="value">
             <number>80</number>
@@ -307,7 +307,7 @@
             <number>1</number>
            </property>
            <property name="maximum">
-             <number>999999</number>
+             <number>9999</number>
            </property>
            <property name="value">
             <number>10</number>
--- a/src/gui/openfilemanager.cpp
+++ b/src/gui/openfilemanager.cpp
@@ -22,12 +22,6 @@
 #include <QDesktopServices>
 #include <QApplication>

-#define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0))
-
-#if !(QTLEGACY)
-#include <QOperatingSystemVersion>
-#endif
-
 namespace OCC {

 // according to the QStandardDir impl from Qt5
@@ -95,14 +89,10 @@ void showInFileManager(const QString &localPath)
 {
    if (Utility::isWindows()) {
 #ifdef Q_OS_WIN
-        #if QTLEGACY
-            if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10)
-        #else
-            if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows7)
-        #endif
-                return;
+        if (QSysInfo::windowsVersion() <= QSysInfo::WV_2003) {
+            return;
+        }
 #endif
-
        QString explorer = "explorer.exe "; // FIXME: we trust it's in PATH
        QFileInfo fi(localPath);

--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -20,7 +20,12 @@
 #include "progressdispatcher.h"
 #include "owncloudsetupwizard.h"
 #include "sharedialog.h"
+#if defined(Q_OS_MAC)
+#include "settingsdialogmac.h"
+#include "macwindow.h" // qtmacgoodies
+#else
 #include "settingsdialog.h"
+#endif
 #include "logger.h"
 #include "logbrowser.h"
 #include "account.h"
@@ -57,7 +62,11 @@ const char propertyAccountC[] = "oc_account";
 ownCloudGui::ownCloudGui(Application *parent)
    : QObject(parent)
    , _tray(nullptr)
+#if defined(Q_OS_MAC)
+    , _settingsDialog(new SettingsDialogMac(this))
+#else
    , _settingsDialog(new SettingsDialog(this))
+#endif
    , _logBrowser(nullptr)
 #ifdef WITH_LIBCLOUDPROVIDERS
    , _bus(QDBusConnection::sessionBus())
@@ -412,7 +421,7 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
        }

        if (accountState->isSignedOut()) {
-            QAction *signin = menu->addAction(tr("Log in …"));
+            QAction *signin = menu->addAction(tr("Log in..."));
            signin->setProperty(propertyAccountC, QVariant::fromValue(accountState));
            connect(signin, &QAction::triggered, this, &ownCloudGui::slotLogin);
        } else {
@@ -666,12 +675,6 @@ void ownCloudGui::updateContextMenu()

    _contextMenu->addSeparator();

-    if (_navLinksMenu) {
-        _contextMenu->addMenu(_navLinksMenu);
-    }
-
-    _contextMenu->addSeparator();
-
    if (accountList.isEmpty()) {
        _contextMenu->addAction(_actionNewAccountWizard);
    }
@@ -685,7 +688,6 @@ void ownCloudGui::updateContextMenu()
    }

    _contextMenu->addSeparator();
-
    if (atLeastOnePaused) {
        QString text;
        if (accountList.count() > 1) {
@@ -775,11 +777,9 @@ void ownCloudGui::setupActions()
 {
    _actionStatus = new QAction(tr("Unknown status"), this);
    _actionStatus->setEnabled(false);
-    _navLinksMenu = new QMenu(tr("Apps"));
-    _navLinksMenu->setEnabled(false);
-    _actionSettings = new QAction(tr("Settings …"), this);
-    _actionNewAccountWizard = new QAction(tr("New account …"), this);
-    _actionRecent = new QAction(tr("View more activity …"), this);
+    _actionSettings = new QAction(tr("Settings..."), this);
+    _actionNewAccountWizard = new QAction(tr("New account..."), this);
+    _actionRecent = new QAction(tr("View more activity..."), this);
    _actionRecent->setEnabled(true);

    QObject::connect(_actionRecent, &QAction::triggered, this, &ownCloudGui::slotShowSyncProtocol);
@@ -818,11 +818,8 @@ void ownCloudGui::fetchNavigationApps(AccountStatePtr account){

 void ownCloudGui::buildNavigationAppsMenu(AccountStatePtr account, QMenu *accountMenu){
    auto navLinks = _navApps.value(account);
-
-    _navLinksMenu->clear();
-    _navLinksMenu->setEnabled(navLinks.size() > 0);
-
    if(navLinks.size() > 0){
+
        // when there is only one account add the nav links above the settings
        QAction *actionBefore = _actionSettings;

@@ -841,13 +838,17 @@ void ownCloudGui::buildNavigationAppsMenu(AccountStatePtr account, QMenu *accoun
        }

        // Create submenu with links
+        QMenu *navLinksMenu = new QMenu(tr("Apps"));
+        accountMenu->insertSeparator(actionBefore);
+        accountMenu->insertMenu(actionBefore, navLinksMenu);
        foreach (const QJsonValue &value, navLinks) {
            auto navLink = value.toObject();
            QAction *action = new QAction(navLink.value("name").toString(), this);
            QUrl href(navLink.value("href").toString());
            connect(action, &QAction::triggered, this, [href] { QDesktopServices::openUrl(href); });
-            _navLinksMenu->addAction(action);
+            navLinksMenu->addAction(action);
        }
+        accountMenu->insertSeparator(actionBefore);
    }
 }

@@ -934,7 +935,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo &
        quint64 totalFileCount = qMax(progress.totalFiles(), currentFile);
        QString msg;
        if (progress.trustEta()) {
-            msg = tr("Syncing %1 of %2 (%3 left)")
+            msg = tr("Syncing %1 of %2  (%3 left)")
                      .arg(currentFile)
                      .arg(totalFileCount)
                      .arg(Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta));
@@ -1068,18 +1069,18 @@ void ownCloudGui::slotShowGuiMessage(const QString &title, const QString &messag
 void ownCloudGui::slotShowSettings()
 {
    if (_settingsDialog.isNull()) {
-        _settingsDialog = new SettingsDialog(this);
+        _settingsDialog =
+#if defined(Q_OS_MAC)
+            new SettingsDialogMac(this);
+#else
+            new SettingsDialog(this);
+#endif
        _settingsDialog->setAttribute(Qt::WA_DeleteOnClose, true);
        _settingsDialog->show();
    }
    raiseDialog(_settingsDialog.data());
 }

-void ownCloudGui::slotSettingsDialogActivated()
-{
-    emit isShowingSettingsDialog();
-}
-
 void ownCloudGui::slotShowSyncProtocol()
 {
    slotShowSettings();
@@ -1134,6 +1135,10 @@ void ownCloudGui::raiseDialog(QWidget *raiseWidget)
        raiseWidget->raise();
        raiseWidget->activateWindow();

+#if defined(Q_OS_MAC)
+        // viel hilft viel ;-)
+        MacWindow::bringToFront(raiseWidget);
+#endif
 #if defined(Q_OS_X11)
        WId wid = widget->winId();
        NETWM::init();
--- a/src/gui/owncloudgui.h
+++ b/src/gui/owncloudgui.h
@@ -34,6 +34,7 @@ namespace OCC {
 class Folder;

 class SettingsDialog;
+class SettingsDialogMac;
 class ShareDialog;
 class Application;
 class LogBrowser;
@@ -70,7 +71,6 @@ public:
 signals:
    void setupProxy();
    void serverError(int code, const QString &message);
-    void isShowingSettingsDialog();

 public slots:
    void setupContextMenu();
@@ -94,7 +94,6 @@ public slots:
    void slotToggleLogBrowser();
    void slotOpenOwnCloud();
    void slotOpenSettingsDialog();
-    void slotSettingsDialogActivated();
    void slotHelp();
    void slotOpenPath(const QString &path);
    void slotAccountStateChanged();
@@ -132,7 +131,11 @@ private:
    void buildNavigationAppsMenu(AccountStatePtr account, QMenu *accountMenu);

    QPointer<Systray> _tray;
+#if defined(Q_OS_MAC)
+    QPointer<SettingsDialogMac> _settingsDialog;
+#else
    QPointer<SettingsDialog> _settingsDialog;
+#endif
    QPointer<LogBrowser> _logBrowser;
    // tray's menu
    QScopedPointer<QMenu> _contextMenu;
@@ -165,7 +168,6 @@ private:
    QAction *_actionQuit;
    QAction *_actionCrash;

-    QMenu *_navLinksMenu;
    QMap<AccountStatePtr, QJsonArray> _navApps;

    QList<QAction *> _recentItemsActions;
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -331,7 +331,7 @@ void OwncloudSetupWizard::slotConnectToOCUrl(const QString &url)
    AbstractCredentials *creds = _ocWizard->getCredentials();
    _ocWizard->account()->setCredentials(creds);
    _ocWizard->setField(QLatin1String("OCUrl"), url);
-    _ocWizard->appendToConfigurationLog(tr("Trying to connect to %1 at %2 …")
+    _ocWizard->appendToConfigurationLog(tr("Trying to connect to %1 at %2...")
                                            .arg(Theme::instance()->appNameGUI())
                                            .arg(url));

@@ -407,8 +407,7 @@ void OwncloudSetupWizard::slotAuthError()
        errorMsg = tr("There was an invalid response to an authenticated webdav request");
    }

-    // bring wizard to top
-    _ocWizard->bringToTop();
+    _ocWizard->show();
    if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds || _ocWizard->currentId() == WizardCommon::Page_Flow2AuthCreds) {
        _ocWizard->back();
    }
@@ -453,7 +452,7 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString &localFo
            tr("Local sync folder %1 already exists, setting it up for sync.<br/><br/>")
                .arg(Utility::escape(localFolder)));
    } else {
-        QString res = tr("Creating local sync folder %1 …").arg(localFolder);
+        QString res = tr("Creating local sync folder %1...").arg(localFolder);
        if (fi.mkpath(localFolder)) {
            FileSystem::setFolderMinimumPermissions(localFolder);
            Utility::setupFavLink(localFolder);
@@ -467,41 +466,7 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString &localFo
        _ocWizard->appendToConfigurationLog(res);
    }
    if (nextStep) {
-        /*
-         * BEGIN - Sanitize URL paths to eliminate double-slashes
-         *
-         *         Purpose: Don't rely on unsafe paths, be extra careful.
-         *
-         *         Example: https://cloud.example.com/remote.php/webdav//
-         *
-        */
-        qCInfo(lcWizard) << "Sanitize got URL path:" << QString(_ocWizard->account()->url().toString() + '/' + _ocWizard->account()->davPath() + remoteFolder);
-
-        QString newDavPath = _ocWizard->account()->davPath(),
-                newRemoteFolder = remoteFolder;
-
-        while (newDavPath.startsWith('/')) {
-            newDavPath.remove(0, 1);
-        }
-        while (newDavPath.endsWith('/')) {
-            newDavPath.chop(1);
-        }
-
-        while (newRemoteFolder.startsWith('/')) {
-            newRemoteFolder.remove(0, 1);
-        }
-        while (newRemoteFolder.endsWith('/')) {
-            newRemoteFolder.chop(1);
-        }
-
-        QString newUrlPath = newDavPath + '/' + newRemoteFolder;
-
-        qCInfo(lcWizard) << "Sanitized to URL path:" << _ocWizard->account()->url().toString() + '/' + newUrlPath;
-        /*
-         * END - Sanitize URL paths to eliminate double-slashes
-        */
-
-        EntityExistsJob *job = new EntityExistsJob(_ocWizard->account(), newUrlPath, this);
+        EntityExistsJob *job = new EntityExistsJob(_ocWizard->account(), _ocWizard->account()->davPath() + remoteFolder, this);
        connect(job, &EntityExistsJob::exists, this, &OwncloudSetupWizard::slotRemoteFolderExists);
        job->start();
    } else {
--- a/src/gui/proxyauthdialog.ui
+++ b/src/gui/proxyauthdialog.ui
@@ -71,7 +71,7 @@
   <item row="2" column="1">
    <widget class="QLabel" name="proxyAddress">
     <property name="text">
-      <string notr="true">TextLabel</string>
+      <string>TextLabel</string>
     </property>
     <property name="textFormat">
      <enum>Qt::PlainText</enum>
--- a/src/gui/remotewipe.cpp
+++ b/src/gui/remotewipe.cpp
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) by Camila Ayres <hello@camila.codes>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#include "remotewipe.h"
-#include "folderman.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkRequest>
-#include <QBuffer>
-
-namespace OCC {
-
-Q_LOGGING_CATEGORY(lcRemoteWipe, "nextcloud.gui.remotewipe", QtInfoMsg)
-
-RemoteWipe::RemoteWipe(AccountPtr account, QObject *parent)
-    : _account(account),
-      _appPassword(QString()),
-      _accountRemoved(false),
-      _networkManager(nullptr),
-      _networkReplyCheck(nullptr),
-      _networkReplySuccess(nullptr)
-{
-    QObject::connect(AccountManager::instance(), &AccountManager::accountRemoved,
-                     this, [=](AccountState *) {
-        _accountRemoved = true;
-    });
-    QObject::connect(this, &RemoteWipe::authorized, FolderMan::instance(),
-                     &FolderMan::slotWipeFolderForAccount);
-    QObject::connect(FolderMan::instance(), &FolderMan::wipeDone, this,
-                     &RemoteWipe::notifyServerSuccessJob);
-    QObject::connect(_account.data(), &Account::appPasswordRetrieved, this,
-                     &RemoteWipe::startCheckJobWithAppPassword);
-}
-
-void RemoteWipe::startCheckJobWithAppPassword(QString pwd){
-    if(pwd.isEmpty())
-        return;
-
-    _appPassword = pwd;
-    QUrl requestUrl = Utility::concatUrlPath(_account->url().toString(),
-                                             QLatin1String("/index.php/core/wipe/check"));
-    QNetworkRequest request;
-    request.setHeader(QNetworkRequest::ContentTypeHeader,
-                      "application/x-www-form-urlencoded");
-    request.setUrl(requestUrl);
-    request.setSslConfiguration(_account->getOrCreateSslConfig());
-    auto requestBody = new QBuffer;
-    QUrlQuery arguments(QString("token=%1").arg(_appPassword));
-    requestBody->setData(arguments.query(QUrl::FullyEncoded).toLatin1());
-    _networkReplyCheck = _networkManager.post(request, requestBody);
-    QObject::connect(&_networkManager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
-		_account.data(), SLOT(slotHandleSslErrors(QNetworkReply *, QList<QSslError>)));
-    QObject::connect(_networkReplyCheck, &QNetworkReply::finished, this,
-                     &RemoteWipe::checkJobSlot);
-}
-
-void RemoteWipe::checkJobSlot()
-{
-    auto jsonData = _networkReplyCheck->readAll();
-    QJsonParseError jsonParseError;
-    QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object();
-    bool wipe = false;
-
-    //check for errors
-    if (_networkReplyCheck->error() != QNetworkReply::NoError ||
-            jsonParseError.error != QJsonParseError::NoError) {
-        QString errorReason;
-        QString errorFromJson = json["error"].toString();
-        if (!errorFromJson.isEmpty()) {
-            qCWarning(lcRemoteWipe) << QString("Error returned from the server: <em>%1<em>")
-                                       .arg(errorFromJson.toHtmlEscaped());
-        } else if (_networkReplyCheck->error() != QNetworkReply::NoError) {
-            qCWarning(lcRemoteWipe) << QString("There was an error accessing the 'token' endpoint: <br><em>%1</em>")
-                              .arg(_networkReplyCheck->errorString().toHtmlEscaped());
-        } else if (jsonParseError.error != QJsonParseError::NoError) {
-            qCWarning(lcRemoteWipe) << QString("Could not parse the JSON returned from the server: <br><em>%1</em>")
-                              .arg(jsonParseError.errorString());
-        } else {
-            qCWarning(lcRemoteWipe) <<  QString("The reply from the server did not contain all expected fields");
-        }
-
-    // check for wipe request
-    } else if(!json.value("wipe").isUndefined()){
-        wipe = json["wipe"].toBool();
-    }
-
-    auto manager = AccountManager::instance();
-    auto accountState = manager->account(_account->displayName()).data();
-
-    if(wipe){
-        /* IMPORTANT - remove later - FIXME MS@2019-12-07 -->
-         * TODO: For "Log out" & "Remove account": Remove client CA certs and KEY!
-         *
-         *       Disabled as long as selecting another cert is not supported by the UI.
-         *
-         *       Being able to specify a new certificate is important anyway: expiry etc.
-         *
-         *       We introduce this dirty hack here, to allow deleting them upon Remote Wipe.
-         */
-        _account->setRemoteWipeRequested_HACK();
-        // <-- FIXME MS@2019-12-07
-
-        // delete account
-        manager->deleteAccount(accountState);
-        manager->save();
-
-        // delete data
-        emit authorized(accountState);
-
-    } else {
-        // ask user for his credentials again
-        accountState->handleInvalidCredentials();
-    }
-
-    _networkReplyCheck->deleteLater();
-}
-
-void RemoteWipe::notifyServerSuccessJob(AccountState *accountState, bool dataWiped){
-    if(_accountRemoved && dataWiped && _account == accountState->account()){
-        QUrl requestUrl = Utility::concatUrlPath(_account->url().toString(),
-                                                 QLatin1String("/index.php/core/wipe/success"));
-        QNetworkRequest request;
-        request.setHeader(QNetworkRequest::ContentTypeHeader,
-                          "application/x-www-form-urlencoded");
-        request.setUrl(requestUrl);
-        request.setSslConfiguration(_account->getOrCreateSslConfig());
-        auto requestBody = new QBuffer;
-        QUrlQuery arguments(QString("token=%1").arg(_appPassword));
-        requestBody->setData(arguments.query(QUrl::FullyEncoded).toLatin1());
-        _networkReplySuccess = _networkManager.post(request, requestBody);
-        QObject::connect(_networkReplySuccess, &QNetworkReply::finished, this,
-                         &RemoteWipe::notifyServerSuccessJobSlot);
-    }
-}
-
-void RemoteWipe::notifyServerSuccessJobSlot()
-{
-    auto jsonData = _networkReplySuccess->readAll();
-    QJsonParseError jsonParseError;
-    QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object();
-    if (_networkReplySuccess->error() != QNetworkReply::NoError ||
-            jsonParseError.error != QJsonParseError::NoError) {
-        QString errorReason;
-        QString errorFromJson = json["error"].toString();
-        if (!errorFromJson.isEmpty()) {
-            qCWarning(lcRemoteWipe) << QString("Error returned from the server: <em>%1</em>")
-                              .arg(errorFromJson.toHtmlEscaped());
-        } else if (_networkReplySuccess->error() != QNetworkReply::NoError) {
-            qCWarning(lcRemoteWipe) << QString("There was an error accessing the 'success' endpoint: <br><em>%1</em>")
-                              .arg(_networkReplySuccess->errorString().toHtmlEscaped());
-        } else if (jsonParseError.error != QJsonParseError::NoError) {
-            qCWarning(lcRemoteWipe) << QString("Could not parse the JSON returned from the server: <br><em>%1</em>")
-                              .arg(jsonParseError.errorString());
-        } else {
-            qCWarning(lcRemoteWipe) << QString("The reply from the server did not contain all expected fields.");
-        }
-    }
-
-    _networkReplySuccess->deleteLater();
-}
-}
--- a/src/gui/remotewipe.h
+++ b/src/gui/remotewipe.h
@@ -1,61 +0,0 @@
-#ifndef REMOTEWIPE_H
-#define REMOTEWIPE_H
-
-#include "accountmanager.h"
-#include <QNetworkAccessManager>
-
-class QJsonDocument;
-class TestRemoteWipe;
-
-namespace OCC {
-
-class RemoteWipe : public QObject
-{
-    Q_OBJECT
-public:
-    explicit RemoteWipe(AccountPtr account, QObject *parent = nullptr);
-
-signals:
-    /**
-     * Notify if wipe was requested
-     */
-    void authorized(AccountState*);
-
-    /**
-     * Notify if user only needs to login again
-     */
-    void askUserCredentials();
-
-public slots:
-    /**
-     * Once receives a 401 or 403 status response it will do a fetch to
-     * <server>/index.php/core/wipe/check
-     */
-    void startCheckJobWithAppPassword(QString);
-
-private slots:
-    /**
-     * If wipe is requested, delete account and data, if not continue by asking
-     * the user to login again
-     */
-    void checkJobSlot();
-
-    /**
-     * Once the client has wiped all the required data a POST to
-     * <server>/index.php/core/wipe/success
-     */
-    void notifyServerSuccessJob(AccountState *accountState, bool);
-    void notifyServerSuccessJobSlot();
-
-private:
-    AccountPtr _account;
-    QString _appPassword;
-    bool _accountRemoved;
-    QNetworkAccessManager _networkManager;
-    QNetworkReply *_networkReplyCheck;
-    QNetworkReply *_networkReplySuccess;
-
-    friend class ::TestRemoteWipe;
-};
-}
-#endif // REMOTEWIPE_H
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -70,7 +70,7 @@ SelectiveSyncWidget::SelectiveSyncWidget(AccountPtr account, QWidget *parent)
    , _inserting(false)
    , _folderTree(new QTreeWidget(this))
 {
-    _loading = new QLabel(tr("Loading …"), _folderTree);
+    _loading = new QLabel(tr("Loading ..."), _folderTree);

    auto layout = new QVBoxLayout(this);
    layout->setContentsMargins(0, 0, 0, 0);
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -48,7 +48,7 @@ const char TOOLBAR_CSS[] =
    "QToolBar QToolBarExtension { padding:0; } "
    "QToolBar QToolButton:checked { background: %3; color: %4; }";

-static const float buttonSizeRatio = 1.618f; // golden ratio
+static const float buttonSizeRatio = 1.618; // golden ratio
 }


@@ -56,6 +56,10 @@ namespace OCC {

 #include "settingsdialogcommon.cpp"

+//
+// Whenever you change something here check both settingsdialog.cpp and settingsdialogmac.cpp !
+//
+
 SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
    : QDialog(parent)
    , _ui(new Ui::SettingsDialog)
@@ -104,9 +108,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
    GeneralSettings *generalSettings = new GeneralSettings;
    _ui->stack->addWidget(generalSettings);

-    // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
-    connect(this, &SettingsDialog::styleChanged, generalSettings, &GeneralSettings::slotStyleChanged);
-
    QAction *networkAction = createColorAwareAction(QLatin1String(":/client/resources/network.png"), tr("Network"));
    _actionGroup->addAction(networkAction);
    _toolBar->addAction(networkAction);
@@ -127,8 +128,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
    connect(showLogWindow, &QAction::triggered, gui, &ownCloudGui::slotToggleLogBrowser);
    addAction(showLogWindow);

-    connect(this, &SettingsDialog::onActivate, gui, &ownCloudGui::slotSettingsDialogActivated);
-
    customizeStyle();

    cfg.restoreGeometry(this);
@@ -161,13 +160,6 @@ void SettingsDialog::changeEvent(QEvent *e)
    case QEvent::PaletteChange:
    case QEvent::ThemeChange:
        customizeStyle();
-
-        // Notify the other widgets (Dark-/Light-Mode switching)
-        emit styleChanged();
-        break;
-    case QEvent::ActivationChange:
-        if(isActiveWindow())
-            emit onActivate();
        break;
    default:
        break;
@@ -271,10 +263,6 @@ void SettingsDialog::accountAdded(AccountState *s)
    // Refresh immediatly when getting online
    connect(s, &AccountState::isConnectedChanged, this, &SettingsDialog::slotRefreshActivityAccountStateSender);

-    // Connect styleChanged event, to adapt (Dark-/Light-Mode switching)
-    connect(this, &SettingsDialog::styleChanged, accountSettings, &AccountSettings::slotStyleChanged);
-    connect(this, &SettingsDialog::styleChanged, _activitySettings[s], &ActivitySettings::slotStyleChanged);
-
    activityAdded(s);
    slotRefreshActivity(s);
 }
@@ -356,13 +344,13 @@ void SettingsDialog::accountRemoved(AccountState *s)
 void SettingsDialog::customizeStyle()
 {
    QString highlightColor(palette().highlight().color().name());
-    QString highlightTextColor(palette().highlightedText().color().name());
+    QString altBase(palette().alternateBase().color().name());
    QString dark(palette().dark().color().name());
    QString background(palette().base().color().name());
-    _toolBar->setStyleSheet(QString::fromLatin1(TOOLBAR_CSS).arg(background, dark, highlightColor, highlightTextColor));
+    _toolBar->setStyleSheet(QString::fromLatin1(TOOLBAR_CSS).arg(background, dark, highlightColor, altBase));

    Q_FOREACH (QAction *a, _actionGroup->actions()) {
-        QIcon icon = Theme::createColorAwareIcon(a->property("iconPath").toString(), palette());
+        QIcon icon = createColorAwareIcon(a->property("iconPath").toString());
        a->setIcon(icon);
        QToolButton *btn = qobject_cast<QToolButton *>(_toolBar->widgetForAction(a));
        if (btn)
@@ -370,6 +358,34 @@ void SettingsDialog::customizeStyle()
    }
 }

+static bool isDarkColor(const QColor &color)
+{
+    // account for different sensitivity of the human eye to certain colors
+    double treshold = 1.0 - (0.299 * color.red() + 0.587 * color.green() + 0.114 * color.blue()) / 255.0;
+    return treshold > 0.5;
+}
+
+QIcon SettingsDialog::createColorAwareIcon(const QString &name)
+{
+    QPalette pal = palette();
+    QImage img(name);
+    QImage inverted(img);
+    inverted.invertPixels(QImage::InvertRgb);
+
+    QIcon icon;
+    if (isDarkColor(pal.color(QPalette::Base))) {
+        icon.addPixmap(QPixmap::fromImage(inverted));
+    } else {
+        icon.addPixmap(QPixmap::fromImage(img));
+    }
+    if (isDarkColor(pal.color(QPalette::HighlightedText))) {
+        icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal, QIcon::On);
+    } else {
+        icon.addPixmap(QPixmap::fromImage(inverted), QIcon::Normal, QIcon::On);
+    }
+    return icon;
+}
+
 class ToolButtonAction : public QWidgetAction
 {
 public:
@@ -410,7 +426,7 @@ QAction *SettingsDialog::createActionWithIcon(const QIcon &icon, const QString &
 QAction *SettingsDialog::createColorAwareAction(const QString &iconPath, const QString &text)
 {
    // all buttons must have the same size in order to keep a good layout
-    QIcon coloredIcon = Theme::createColorAwareIcon(iconPath, palette());
+    QIcon coloredIcon = createColorAwareIcon(iconPath);
    return createActionWithIcon(coloredIcon, text, iconPath);
 }

--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -63,10 +63,6 @@ public slots:
    void slotAccountAvatarChanged();
    void slotAccountDisplayNameChanged();

-signals:
-    void styleChanged();
-    void onActivate();
-
 protected:
    void reject() override;
    void accept() override;
@@ -80,6 +76,7 @@ private:
    void customizeStyle();
    void activityAdded(AccountState *);

+    QIcon createColorAwareIcon(const QString &name);
    QAction *createColorAwareAction(const QString &iconName, const QString &fileName);
    QAction *createActionWithIcon(const QIcon &icon, const QString &text, const QString &iconPath = QString());

--- a/src/gui/settingsdialogcommon.cpp
+++ b/src/gui/settingsdialogcommon.cpp
@@ -2,7 +2,7 @@ namespace SettingsDialogCommon
 {

 /** display name with two lines that is displayed in the settings
- * If width is bigger than 0, the string will be elided so it does not exceed that width
+ * If width is bigger than 0, the string will be ellided so it does not exceed that width
 */
 QString shortDisplayNameForSettings(Account* account, int width)
 {
--- a/src/gui/settingsdialogmac.cpp
+++ b/src/gui/settingsdialogmac.cpp
@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) by Denis Dzyubenko
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "settingsdialogmac.h"
+
+#include "macstandardicon.h"
+
+#include "folderman.h"
+#include "theme.h"
+#include "generalsettings.h"
+#include "networksettings.h"
+#include "accountsettings.h"
+#include "accountstate.h"
+#include "creds/abstractcredentials.h"
+#include "configfile.h"
+#include "progressdispatcher.h"
+#include "owncloudgui.h"
+#include "activitywidget.h"
+#include "accountmanager.h"
+
+#include <QLabel>
+#include <QStandardItemModel>
+#include <QPushButton>
+#include <QSettings>
+#include <QPainter>
+#include <QPainterPath>
+
+namespace OCC {
+
+#include "settingsdialogcommon.cpp"
+
+
+// Duplicate in settingsdialog.cpp
+static QIcon circleMask(const QImage &avatar)
+{
+    int dim = avatar.width();
+
+    QPixmap fixedImage(dim, dim);
+    fixedImage.fill(Qt::transparent);
+
+    QPainter imgPainter(&fixedImage);
+    QPainterPath clip;
+    clip.addEllipse(0, 0, dim, dim);
+    imgPainter.setClipPath(clip);
+    imgPainter.drawImage(0, 0, avatar);
+    imgPainter.end();
+
+    return QIcon(fixedImage);
+}
+
+
+//
+// Whenever you change something here check both settingsdialog.cpp and settingsdialogmac.cpp !
+//
+SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)
+    : MacPreferencesWindow(parent)
+    , _gui(gui)
+{
+    // do not show minimize button. There is no use, and restoring the
+    // dialog from minimize is broken in MacPreferencesWindow
+    setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint | Qt::WindowMaximizeButtonHint);
+
+    // Emulate dialog behavior: Escape means close
+    QAction *closeDialogAction = new QAction(this);
+    closeDialogAction->setShortcut(QKeySequence(Qt::Key_Escape));
+    connect(closeDialogAction, &QAction::triggered, this, &SettingsDialogMac::close);
+    addAction(closeDialogAction);
+    // People perceive this as a Window, so also make Ctrl+W work
+    QAction *closeWindowAction = new QAction(this);
+    closeWindowAction->setShortcut(QKeySequence("Ctrl+W"));
+    connect(closeWindowAction, &QAction::triggered, this, &SettingsDialogMac::close);
+    addAction(closeWindowAction);
+    // People perceive this as a Window, so also make Ctrl+H work
+    QAction *hideWindowAction = new QAction(this);
+    hideWindowAction->setShortcut(QKeySequence("Ctrl+H"));
+    connect(hideWindowAction, &QAction::triggered, this, &SettingsDialogMac::hide);
+    addAction(hideWindowAction);
+
+    setObjectName("SettingsMac"); // required as group for saveGeometry call
+
+    setWindowTitle(tr("%1").arg(Theme::instance()->appNameGUI()));
+
+    connect(AccountManager::instance(), &AccountManager::accountAdded,
+        this, &SettingsDialogMac::accountAdded);
+    connect(AccountManager::instance(), &AccountManager::accountRemoved,
+        this, &SettingsDialogMac::accountRemoved);
+
+    _actionsIdx = -1;
+    foreach (auto ai, AccountManager::instance()->accounts()) {
+        accountAdded(ai.data());
+    }
+
+    QIcon generalIcon = MacStandardIcon::icon(MacStandardIcon::PreferencesGeneral);
+    GeneralSettings *generalSettings = new GeneralSettings;
+    addPreferencesPanel(generalIcon, tr("General"), generalSettings);
+
+    QIcon networkIcon = MacStandardIcon::icon(MacStandardIcon::Network);
+    NetworkSettings *networkSettings = new NetworkSettings;
+    addPreferencesPanel(networkIcon, tr("Network"), networkSettings);
+
+    QAction *showLogWindow = new QAction(this);
+    showLogWindow->setShortcut(QKeySequence("F12"));
+    connect(showLogWindow, &QAction::triggered, gui, &ownCloudGui::slotToggleLogBrowser);
+    addAction(showLogWindow);
+
+    ConfigFile cfg;
+    cfg.restoreGeometry(this);
+}
+
+void SettingsDialogMac::closeEvent(QCloseEvent *event)
+{
+    ConfigFile cfg;
+    cfg.saveGeometry(this);
+    MacPreferencesWindow::closeEvent(event);
+}
+
+void SettingsDialogMac::showActivityPage()
+{
+    // Count backwards (0-based) from the last panel (multiple accounts can be on the left)
+    setCurrentPanelIndex(preferencePanelCount() - 1 - 2);
+}
+
+void SettingsDialogMac::accountAdded(AccountState *s)
+{
+    QIcon accountIcon = MacStandardIcon::icon(MacStandardIcon::UserAccounts);
+    auto accountSettings = new AccountSettings(s, this);
+    QString displayName = Theme::instance()->multiAccount() ? SettingsDialogCommon::shortDisplayNameForSettings(s->account().data(), 0) : tr("Account");
+
+    // this adds the panel - nothing to add here just to fix the order
+    insertPreferencesPanel(++_actionsIdx, accountIcon, displayName, accountSettings);
+
+    connect(accountSettings, &AccountSettings::folderChanged, _gui, &ownCloudGui::slotFoldersChanged);
+    connect(accountSettings, &AccountSettings::openFolderAlias, _gui, &ownCloudGui::slotFolderOpenAction);
+
+    connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialogMac::slotAccountAvatarChanged);
+    connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialogMac::slotAccountDisplayNameChanged);
+
+    // Refresh immediatly when getting online
+    connect(s, &AccountState::isConnectedChanged, this, &SettingsDialogMac::slotRefreshActivityAccountStateSender);
+
+    // Add activity panel
+    QIcon activityIcon(QLatin1String(":/client/resources/activity.png"));
+    _activitySettings[s] = new ActivitySettings(s, this);
+    insertPreferencesPanel(++_actionsIdx, activityIcon, tr("Activity"), _activitySettings[s]);
+    connect(_activitySettings[s], SIGNAL(guiLog(QString, QString)), _gui,
+        SLOT(slotShowOptionalTrayMessage(QString, QString)));
+
+    // if this is not the first account, add separator 2 positions before int the toolbar
+    if(AccountManager::instance()->accounts().first().data() != s &&
+        AccountManager::instance()->accounts().size() >= 1){
+        _separators[s] = insertSeparator(_actionsIdx - 1);
+        ++_actionsIdx; //we have one more item in the toolbar
+    }
+
+    ConfigFile cfg;
+    _activitySettings[s]->setNotificationRefreshInterval(cfg.notificationRefreshInterval());
+
+    slotRefreshActivity(s);
+    setCurrentPanelIndex(0);
+}
+
+void SettingsDialogMac::accountRemoved(AccountState *s)
+{
+    auto list = findChildren<AccountSettings *>(QString());
+    foreach (auto p, list) {
+        if (p->accountsState() == s) {
+            removePreferencesPanel(p);
+
+            // remove settings panel
+            if(_activitySettings.contains(s))
+                removePreferencesPanel(_activitySettings[s]);
+
+            // remove separator if there is any
+            if(_separators.contains(s)){
+                removeSeparator(_separators[s]);
+                _separators.remove(s);
+            }
+        }
+    }
+}
+
+void SettingsDialogMac::slotRefreshActivityAccountStateSender()
+{
+    slotRefreshActivity(qobject_cast<AccountState*>(sender()));
+}
+
+void SettingsDialogMac::slotRefreshActivity(AccountState *accountState)
+{
+    if (accountState) {
+        _activitySettings[accountState]->slotRefresh();
+    }
+}
+
+void SettingsDialogMac::slotAccountAvatarChanged()
+{
+    Account *account = static_cast<Account *>(sender());
+    auto list = findChildren<AccountSettings *>(QString());
+    foreach (auto p, list) {
+        if (p->accountsState()->account() == account) {
+            int idx = indexForPanel(p);
+            QImage pix = account->avatar();
+            if (!pix.isNull()) {
+                setPreferencesPanelIcon(idx, circleMask(pix));
+            }
+        }
+    }
+}
+
+void SettingsDialogMac::slotAccountDisplayNameChanged()
+{
+    Account *account = static_cast<Account *>(sender());
+    auto list = findChildren<AccountSettings *>(QString());
+    foreach (auto p, list) {
+        if (p->accountsState()->account() == account) {
+            int idx = indexForPanel(p);
+            QString displayName = account->displayName();
+            if (!displayName.isNull()) {
+                displayName = Theme::instance()->multiAccount()
+                        ? SettingsDialogCommon::shortDisplayNameForSettings(account, 0)
+                        : tr("Account");
+                setPreferencesPanelTitle(idx, displayName);
+            }
+        }
+    }
+}
+
+}
+
--- a/Show More
+++ b/Show More