VERSION.cmake: 2.3.1 rc1

ChangeLog

@@ -1,32 +1,11 @@
 ChangeLog
 =========
 
-version 2.3.3 (2017-08-XX)
-* Chunking NG: Don't use old chunking on new DAV endpoint (#5855)
-* Selective Sync: Skip excluded folders when reading DB, don't let them show errors (#5772)
-* Settings: Make window bigger so Qt version is always visible (#5760)
-* Share links: Show warning that public link shares are public (#5786)
-* Downloads: Re-trigger folder discovery on HTTP 404 (#5799)
-* Notifications: Propagate "Dismiss" as DELETE to server (#5922)
-* Overlay Icons: Fix potential hangs on Windows
-* SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
-* SyncJournalDB: Log reason for sqlite3 opening errors
-* Windows: Fix a memory leak in FileSystem::longWinPath
-* Switch Linux build also to Qt 5.6.2 (#5470)
-* Stopped maintaining Qt 4 buildability
-
-version 2.3.2 (2017-05-08)
-* Fix more crashes (thanks to everyone submitting to our crash reporter!)
-* Improve compatibility with server 10.0 (#5691, OC-Total-Length)
-* Share dialog: UI improvements, Bring to front on tray click
-* owncloudcmd: Align process return value with sync return value (#3936)
-* Fix disk free check on Windows when opening the local DB
-
-version 2.3.1 (2017-03-21)
+version 2.3.1 (2017-03-2x)
 * Fix several crashes (thanks to everyone submitting to our crash reporter!)
 * Improve HTTP redirect handling (#5555)
 * Blacklist: Escalate repeated soft error to normal error (#5500)
-* NTFS: Do not attempt to upload two existing files with similar casing (#5544)
+* NTFS: Do not attempt to upload two existing files with similar casing (#5533)
 * Fix URL for linking to application password generation for ownCloud 10.0 (#5605)
 
 version 2.3.0 (2017-03-03)

Jenkinsfile

@@ -5,20 +5,36 @@ node('CLIENT') {
         checkout scm
         sh '''git submodule update --init'''
 
+    stage 'Qt4'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
+    stage 'Qt4 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
+		make
+		ctest --output-on-failure'''
+
     stage 'Qt5'
         sh '''rm -rf build
 		mkdir build
 		cd build
-		cmake -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 -DWITH_TESTING=1 -DBUILD_WITH_QT4=OFF ..
-		make -j4
+		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
 		ctest --output-on-failure'''
 
     stage 'Qt5 - clang'
         sh '''rm -rf build
 		mkdir build
 		cd build
-		cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DWITH_TESTING=1 -DBUILD_WITH_QT4=OFF ..
-		make -j4
+		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
+		make
 		ctest --output-on-failure'''
 
 

VERSION.cmake

@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 3 )
-set( MIRALL_VERSION_PATCH 3 )
+set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_VERSION_YEAR  2017 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

admin/win/nsi/l10n/Estonian.nsh

@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Juba paigaldatud"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vali, kuidas sa soovid paigaldada ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.$\n$\nVali toiming, mida sa tahad sooritada ning kliki jätkamiseks nuppu Next."
 StrCpy $PageReinstall_SAME_Field_2 "Lisa/Taaspaigalda komponente"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
@@ -41,3 +40,4 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligip
 StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
 StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
 StrCpy $SectionGroup_Shortcuts "Otseteed"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."

admin/win/nsi/l10n/French.nsh

@@ -25,7 +25,7 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Raccourci de lancement rapide"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Création d'un raccourci de lancement rapide"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Essentiels de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Raccourci de ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Raccourci de bureau pour ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Raccourci Bureau de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Raccourci de lancement rapide de ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "Écriture du désinstallateur"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Écriture des clefs de registre du désinstallateur"

admin/win/nsi/l10n/Portuguese.nsh

@@ -8,7 +8,7 @@ StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Já está instalada uma versão mais recente de ${APPLICATION_NAME}! Não é recomendada a instalação de uma versão mais antiga. Se realmente desejar instalar esta versão antiga, aconselha-se que desinstale primeiro a versão atual. Selecione a operação que deseja executar e clique em $\"Seguinte$\" para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente da aplicação ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalada.$\nSelecione a operação que deseja realizar e clique em 'Seguinte' para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
@@ -17,8 +17,8 @@ StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manute
 StrCpy $SEC_APPLICATION_DETAILS "A instalar o essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integração para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Iniciar"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} no Menu Iniciar."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos na área de trabalho"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"

cmake/modules/FindQt5Keychain.cmake

@@ -9,19 +9,9 @@
 #  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
 #  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
 
-# When we build our own Qt we also need to build QtKeychain with it
-# so that it doesn't pull a different Qt version. For that reason
-# first look in the Qt lib directory for QtKeychain.
-get_target_property(_QTCORE_LIB_PATH Qt5::Core IMPORTED_LOCATION_RELEASE)
-
-# Use PATH here because Debian 7.0 has CMake 2.8.9 and DIRECTORY is only available from 2.8.12+
-get_filename_component(QT_LIB_DIR "${_QTCORE_LIB_PATH}" PATH)
-
 find_path(QTKEYCHAIN_INCLUDE_DIR
             NAMES
               keychain.h
-            HINTS
-               ${QT_LIB_DIR}/../include
             PATH_SUFFIXES
               qt5keychain
             )
@@ -30,8 +20,6 @@ find_library(QTKEYCHAIN_LIBRARY
             NAMES
               qt5keychain
               lib5qtkeychain
-            HINTS
-               ${QT_LIB_DIR}
             PATHS
                /usr/lib
                /usr/lib/${CMAKE_ARCH_TRIPLET}

cmake/modules/FindQtKeychain.cmake

@@ -0,0 +1,39 @@
+# (c) 2014 Copyright ownCloud GmbH
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# - Try to find QtKeychain
+# Once done this will define
+#  QTKEYCHAIN_FOUND - System has QtKeychain
+#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeychain include directories
+#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
+#  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
+
+find_path(QTKEYCHAIN_INCLUDE_DIR
+            NAMES
+                keychain.h
+            PATH_SUFFIXES
+                qtkeychain
+    )
+
+
+find_library(QTKEYCHAIN_LIBRARY
+            NAMES
+              qtkeychain
+              libqtkeychain
+            PATHS
+               /usr/lib
+               /usr/lib/${CMAKE_ARCH_TRIPLET}
+               /usr/local/lib
+               /opt/local/lib
+               ${CMAKE_LIBRARY_PATH}
+               ${CMAKE_INSTALL_PREFIX}/lib
+            )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(QtKeychain  DEFAULT_MSG
+	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
+
+mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY)

csync/src/csync_exclude.c

@@ -235,11 +235,6 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
         match = CSYNC_FILE_SILENTLY_EXCLUDED;
         goto out;
     }
-    rc = csync_fnmatch(".sync_*.db*", bname, 0);
-    if (rc == 0) {
-        match = CSYNC_FILE_SILENTLY_EXCLUDED;
-        goto out;
-    }
     rc = csync_fnmatch(".csync_journal.db*", bname, 0);
     if (rc == 0) {
         match = CSYNC_FILE_SILENTLY_EXCLUDED;

csync/src/csync_statedb.c

@@ -439,7 +439,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
      * In other words, anything that is between  path+'/' and path+'0',
      * (because '0' follows '/' in ascii)
      */
-    const char *below_path_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE path > (?||'/') AND path < (?||'0') ORDER BY path||'/' ASC";
+    const char *below_path_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE path > (?||'/') AND path < (?||'0')";
     SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, below_path_query, -1, &stmt, NULL));
     ctx->statedb.lastReturnValue = rc;
     if( rc != SQLITE_OK ) {
@@ -462,36 +462,6 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
 
         rc = _csync_file_stat_from_metadata_table( &st, stmt);
         if( st ) {
-            /* When selective sync is used, the database may have subtrees with a parent
-             * whose etag (md5) is _invalid_. These are ignored and shall not appear in the
-             * remote tree.
-             * Sometimes folders that are not ignored by selective sync get marked as
-             * _invalid_, but that is not a problem as the next discovery will retrieve
-             * their correct etags again and we don't run into this case.
-             */
-            if( c_streq(st->etag, "_invalid_") ) {
-                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s selective sync excluded", st->path);
-                char *skipbase = c_strdup(st->path);
-                skipbase[st->pathlen] = '/';
-                int skiplen = st->pathlen + 1;
-
-                /* Skip over all entries with the same base path. Note that this depends
-                 * strongly on the ordering of the retrieved items. */
-                do {
-                    csync_file_stat_free(st);
-                    rc = _csync_file_stat_from_metadata_table( &st, stmt);
-                    if( st && strncmp(st->path, skipbase, skiplen) != 0 ) {
-                        break;
-                    }
-                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s selective sync excluded because the parent is", st->path);
-                } while( rc == SQLITE_ROW );
-
-                /* End of data? */
-                if( rc != SQLITE_ROW || !st ) {
-                    continue;
-                }
-            }
-
             /* Check for exclusion from the tree.
              * Note that this is only a safety net in case the ignore list changes
              * without a full remote discovery being triggered. */

csync/tests/csync_tests/check_csync_exclude.c

@@ -157,16 +157,7 @@ static void check_csync_excluded(void **state)
     assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
     rc = csync_excluded_no_ctx(csync->excludes, "subdir/._sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
     assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
-    rc = csync_excluded_no_ctx(csync->excludes, ".sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, ".sync_5bdd60bdfcfa.db.ctmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, ".sync_5bdd60bdfcfa.db-shm", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "subdir/.sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-
+    
 
     /* pattern ]*.directory - ignore and remove */
     rc = csync_excluded_no_ctx(csync->excludes, "my.~directory", CSYNC_FTW_TYPE_FILE);

doc/conffile.rst

@@ -16,50 +16,20 @@ format. You can overwrite changes using the ownCloud configuration dialog.
 .. note:: Use caution when making changes to the ownCloud Client configuration
    file.  Incorrect settings can produce unintended results.
 
-Some interesting values that can be set on the configuration file are:
+You can change the following configuration settings in the ``[ownCloud]`` section:
 
-+----------------------------------------------------------------------------------------------------------------------------------------------------------+
-| ``[ownCloud]`` section                                                                                                                                   |
-+=================================+===============+========================================================================================================+
-| Variable                        | Default       | Meaning                                                                                                |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``remotePollInterval``          | ``30000``     | Specifies the poll time for the remote repository in milliseconds.                                     |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``forceSyncInterval``           | ``7200000``   | The duration of no activity after which a synchronization run shall be triggered automatically.        |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``notificationRefreshInterval`` | ``300000``    | Specifies the default interval of checking for new server notifications in milliseconds.               |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
+- ``remotePollInterval`` (default: ``30000``) -- Specifies the poll time for the remote repository in milliseconds.
 
+- ``forceSyncInterval`` (default: ``7200000``) -- The duration of no activity after which a synchronization run shall be triggered automatically.
 
-+----------------------------------------------------------------------------------------------------------------------------------------------------------+
-| ``[General]`` section                                                                                                                                    |
-+=================================+===============+========================================================================================================+
-| Variable                        | Default       | Meaning                                                                                                |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``chunkSize``                   | ``5242880``   | Specifies the chunk size of uploaded files in bytes.                                                   |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``promptDeleteAllFiles``        | ``true``      | If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted. |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``maxLogLines``                 | ``20000``     | Specifies the maximum number of log lines displayed in the log window.                                 |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``timeout``                     | ``300``       | The timeout for network connections in seconds.                                                        |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
+- ``notificationRefreshInterval`` (default: ``300000``)  -- Specifies the default interval of checking for new server notifications in milliseconds.
 
+You can change the following configuration settings in the ``[General]`` section:
 
-+----------------------------------------------------------------------------------------------------------------------------------------------------------+
-| ``[Proxy]`` section                                                                                                                                      |
-+=================================+===============+========================================================================================================+
-| Variable                        | Default       | Meaning                                                                                                |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``host``                        | ``127.0.0.1`` | The address of the proxy server.                                                                       |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``port``                        | ``8080``      | The port were the proxy is listening.                                                                  |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``type``                        | ``2``         | ``0`` for System Proxy.                                                                                |
-+                                 +               +--------------------------------------------------------------------------------------------------------+
-|                                 |               | ``1`` for SOCKS5 Proxy.                                                                                |
-+                                 +               +--------------------------------------------------------------------------------------------------------+
-|                                 |               | ``2`` for No Proxy.                                                                                    |
-+                                 +               +--------------------------------------------------------------------------------------------------------+
-|                                 |               | ``3`` for HTTP(S) Proxy.                                                                               |
-+---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
+- ``chunkSize`` (default:  ``5242880``) -- Specifies the chunk size of uploaded files in bytes.
+
+- ``promptDeleteAllFiles`` (default:  ``true``) -- If a UI prompt should ask for confirmation if it was detected that all files and folders were deleted.
+
+- ``maxLogLines`` (default:  ``20000``) -- Specifies the maximum number of log lines displayed in the log window.
+
+- ``timeout`` (default: ``300``) -- The timeout for network connections in seconds.

doc/faq.rst

@@ -18,32 +18,3 @@ The sync client has been intentionally limited to sync no deeper than
 fifty sub-directories, to help prevent memory problems. 
 Unfortunately, it, *currently*, does not report an error when this occurs. 
 However, a UI notification is planned for a future release of ownCloud.
-
-I want to move my local sync folder
------------------------------------
-
-The ownCloud desktop client does not provide a way to change the local sync directory. 
-However, it can be done, though it is a bit unorthodox. 
-Specifically, you have to:
-
-1. Remove the existing connection which syncs to the wrong directory
-2. Add a new connection which syncs to the desired directory
-
-image:: images/setup/ownCloud-remove_existing_connection.png
-
-To do so, in the client UI, which you can see above, click the "**Account**" drop-down menu and then click "Remove". 
-This will display a "**Confirm Account Removal**" dialog window.
-
-image:: images/setup/ownCloud-remove_existing_connection_confirmation_dialog.png
-
-If you're sure, click "**Remove connection**".
-
-Then, click the Account drop-down menu again, and this time click "**Add new**".
-
-image:: images/setup/ownCloud-replacement_connection_wizard.png
-
-This opens the ownCloud Connection Wizard, which you can see above, *but* with an extra option.
-This option provides the ability to either: keep the existing data (synced by the previous connection) or to start a clean sync (erasing the existing data).
-
-Make your choice and click "**Connect...**".
-This will then step you through the Connection Wizard, just as you did when you setup the previous sync connection, but giving you the opportunity to choose a new sync directory.

doc/owncloudcmd.rst

@@ -60,9 +60,10 @@ Other command line switches supported by ``owncloudcmd`` include the following:
 Credential Handling
 ~~~~~~~~~~~~~~~~~~~
 
-``owncloudcmd`` requires the user to specify the username and password using the standard URL pattern, e.g., 
-
-::
+``owncloudcmd`` uses the credentials of the GUI synchronization client.
+If no client is configured, or if you choose to use a different user to synchronize,
+you can specify the user
+password setting with the usual URL pattern.  For example::
 
   $ owncloudcmd /home/user/my_sync_folder https://carla:secret@server/owncloud/remote.php/webdav/
 

doc/troubleshooting.rst

@@ -55,8 +55,8 @@ Identifying Basic Functionality Problems
 ---------------------
 
 If you see this error message stop your client, delete the
-``._sync_xxxxxxx.db`` file, and then restart your client.
-There is a  hidden ``._sync_xxxxxxx.db`` file inside the folder of every account
+``.csync_journal.db`` file, and then restart your client. 
+There is a  ``.csync_journal.db`` file inside the folder of every account
 configured on your client. 
 
 .. NOTE::

issue_template.md

@@ -2,7 +2,7 @@
 Please try to only report a bug if it happens with the latest version
 The latest version can be seen by checking the ChangeLog: https://owncloud.org/changelog/desktop/
 
-For support try: https://central.owncloud.org/c/desktop-client
+For support try: https://central.owncloud.org/c/help/desktop-file-sync
 --->
 
 

mirall.desktop.in

@@ -9,6 +9,628 @@ Icon=@APPLICATION_EXECUTABLE@
 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
+
+
+# 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
+
+
+# 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
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
 # Translations
 
 
@@ -232,14 +854,10 @@ Icon[eu]=@APPLICATION_EXECUTABLE@
 GenericName[fa]=همسان سازی پوشه‌ها
 Name[fa]=@APPLICATION_EXECUTABLE@ نسخه‌ی همسان سازی مشتری
 Icon[fa]=@APPLICATION_EXECUTABLE@
-Comment[fr]=Synchronisez vos dossiers avec un serveur @APPLICATION_NAME@
+Comment[fr]=Application de bureau pour synchroniser des dossiers avec un serveur @APPLICATION_NAME@
 GenericName[fr]=Synchronisation de dossier
 Name[fr]=Client de synchronisation @APPLICATION_NAME@
 Icon[fr]=@APPLICATION_EXECUTABLE@
-Comment[gl]=@APPLICATION_NAME@ cliente de sincronización para escritorio
-GenericName[gl]=Sincronizar Cartafol
-Name[gl]=@APPLICATION_NAME@ cliente de sincronización para escritorio
-Icon[gl]=@APPLICATION_EXECUTABLE@
 Comment[he]=@APPLICATION_NAME@ לקוח סנכון שולחן עבודה
 GenericName[he]=סנכון תיקייה
 Name[he]=@APPLICATION_NAME@ לקוח סנכרון שולחן עבודה 
@@ -323,12 +941,7 @@ Comment[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
 GenericName[zh_CN]=文件夹同步
 Name[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
 Icon[zh_CN]=@APPLICATION_EXECUTABLE@
-Comment[zh_HK]=桌面版同步客户端
 GenericName[zh_TW]=資料夾同步
-Comment[es_AR]=Cliente de sincronización para escritorio @APPLICATION_NAME@ 
-GenericName[es_AR]=Sincronización de directorio
-Name[es_AR]=Cliente de sincronización para escritorio @APPLICATION_NAME@ 
-Icon[es_AR]=@APPLICATION_EXECUTABLE@
 Comment[lt_LT]=@APPLICATION_NAME@ darbalaukio sinchronizavimo programa
 GenericName[lt_LT]=Katalogo sinchnorizacija
 Name[lt_LT]=@APPLICATION_NAME@ darbalaukio programa

shell_integration/windows/OCUtil/RemotePathChecker.cpp

@@ -172,10 +172,9 @@ void RemotePathChecker::workerThreadLoop()
 
 
 RemotePathChecker::RemotePathChecker()
-    : _stop(false)
-    , _watchedDirectories(make_shared<const vector<wstring>>())
+    : _watchedDirectories(make_shared<const vector<wstring>>())
     , _connected(false)
-    , _newQueries(CreateEvent(NULL, FALSE, FALSE, NULL))
+    , _newQueries(CreateEvent(NULL, true, true, NULL))
     , _thread([this]{ this->workerThreadLoop(); })
 {
 }

shell_integration/windows/OCUtil/Version.h

@@ -2,7 +2,7 @@
 
 // This is the number that will end up in the version window of the DLLs.
 // Increment this version before committing a new build if you are today's shell_integration build master.
-#define OCEXT_BUILD_NUM 45
+#define OCEXT_BUILD_NUM 44
 
 #define STRINGIZE2(s) #s
 #define STRINGIZE(s) STRINGIZE2(s)

src/cmd/cmd.cpp

@@ -469,7 +469,7 @@ restart_sync:
     }
 
     Cmd cmd;
-    QString dbPath = options.source_dir + SyncJournalDb::makeDbName(options.source_dir, credentialFreeUrl, folder, user);
+    QString dbPath = options.source_dir + SyncJournalDb::makeDbName(credentialFreeUrl, folder, user);
     SyncJournalDb db(dbPath);
 
     if (!selectiveSyncList.empty()) {
@@ -478,12 +478,7 @@ restart_sync:
 
     SyncEngine engine(account, options.source_dir, folder, &db);
     engine.setIgnoreHiddenFiles(options.ignoreHiddenFiles);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    QObject::connect(&engine, &SyncEngine::finished,
-                     [&app](bool result) { app.exit(result ? EXIT_SUCCESS : EXIT_FAILURE); });
-#else
     QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
-#endif
     QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));
 
 
@@ -510,7 +505,7 @@ restart_sync:
     // Have to be done async, else, an error before exec() does not terminate the event loop.
     QMetaObject::invokeMethod(&engine, "startSync", Qt::QueuedConnection);
 
-    int resultCode = app.exec();
+    app.exec();
 
     if (engine.isAnotherSyncNeeded() != NoFollowUpSync) {
         if (restartCount < options.restartTimes) {
@@ -521,6 +516,6 @@ restart_sync:
         qWarning() << "Another sync is needed, but not done because restart count is exceeded" << restartCount;
     }
 
-    return resultCode;
+    return 0;
 }
 

src/gui/accountsettings.cpp

@@ -313,9 +313,10 @@ void AccountSettings::slotFolderWizardAccepted()
                                      tr("<p>Could not create local folder <i>%1</i>.")
                                         .arg(QDir::toNativeSeparators(definition.localPath)));
                 return;
+            } else {
+                FileSystem::setFolderMinimumPermissions(definition.localPath);
             }
         }
-        FileSystem::setFolderMinimumPermissions(definition.localPath);
     }
 
     /* take the value from the definition of already existing folders. All folders have

src/gui/accountstate.cpp

@@ -281,12 +281,9 @@ void AccountState::slotCredentialsFetched(AbstractCredentials* credentials)
 
     _waitingForNewCredentials = false;
 
-    if (_connectionValidator) {
-        // When new credentials become available we always want to restart the
-        // connection validation, even if it's currently running.
-        _connectionValidator->deleteLater();
-        _connectionValidator = 0;
-    }
+    // When new credentials become available we always want to restart the
+    // connection validation, even if it's currently running.
+    delete _connectionValidator;
 
     checkConnectivity();
 }
@@ -301,12 +298,9 @@ void AccountState::slotCredentialsAsked(AbstractCredentials* credentials)
         return;
     }
 
-    if (_connectionValidator) {
-        // When new credentials become available we always want to restart the
-        // connection validation, even if it's currently running.
-        _connectionValidator->deleteLater();
-        _connectionValidator = 0;
-    }
+    // When new credentials become available we always want to restart the
+    // connection validation, even if it's currently running.
+    delete _connectionValidator;
 
     checkConnectivity();
 }

src/gui/activitywidget.cpp

@@ -438,13 +438,14 @@ void ActivityWidget::slotNotifyServerFinished( const QString& reply, int replyCo
     }
 
     endNotificationRequest(job->widget(), replyCode);
+    // FIXME: remove the  widget after a couple of seconds
     qDebug() << Q_FUNC_INFO << "Server Notification reply code"<< replyCode << reply;
 
     // if the notification was successful start a timer that triggers
     // removal of the done widgets in a few seconds
     // Add 200 millisecs to the predefined value to make sure that the timer in
     // widget's method readyToClose() has elapsed.
-    if( replyCode == OCS_SUCCESS_STATUS_CODE || replyCode == OCS_SUCCESS_STATUS_CODE_V2 ) {
+    if( replyCode == OCS_SUCCESS_STATUS_CODE ) {
         scheduleWidgetToRemove( job->widget() );
     }
 }

src/gui/creds/httpcredentialsgui.cpp

@@ -70,19 +70,17 @@ void HttpCredentialsGui::askFromUserAsync()
 
 QString HttpCredentialsGui::requestAppPasswordText(const Account* account)
 {
-    int version = account->serverVersionInt();
-    QString path;
-
-    // Version may not be available before login on new servers!
-    if (!version || version >= Account::makeServerVersion(10, 0, 0)) {
-        path = QLatin1String("/index.php/settings/personal?sectionid=security#apppasswords");
-    } else if (version >= Account::makeServerVersion(9, 1, 0)) {
-        path = QLatin1String("/index.php/settings/personal?section=apppasswords");
-    } else {
+    if (account->serverVersionInt() < Account::makeServerVersion(9, 1, 0)) {
         // Older server than 9.1 does not have the feature to request App Password
         return QString();
     }
 
+    QString path;
+    if (account->serverVersionInt() < Account::makeServerVersion(10, 0, 0)) {
+        path = QLatin1String("/index.php/settings/personal?section=apppasswords");
+    } else {
+        path = QLatin1String("/index.php/settings/personal?sectionid=security#apppasswords");
+    }
     return tr("<a href=\"%1\">Click here</a> to request an app password from the web interface.")
         .arg(account->url().toString() + path);
 }

src/gui/folder.cpp

@@ -345,9 +345,7 @@ void Folder::showSyncResultPopup()
     if( _syncResult.firstConflictItem() ) {
         createGuiLog( _syncResult.firstConflictItem()->_file, LogStatusConflict, _syncResult.numConflictItems() );
     }
-    if (int errorCount = _syncResult.numErrorItems()) {
-        createGuiLog( _syncResult.firstItemError()->_file, LogStatusError, errorCount );
-    }
+    createGuiLog( _syncResult.firstItemError()->_file, LogStatusError, _syncResult.numErrorItems() );
 
     qDebug() << "OO folder slotSyncFinished: result: " << int(_syncResult.status());
 }
@@ -911,7 +909,6 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel
     }
     *cancel = msgBox.clickedButton() == keepBtn;
     if (*cancel) {
-        FileSystem::setFolderMinimumPermissions(path());
         journalDb()->clearFileTable();
         _lastEtag.clear();
         slotScheduleThisFolder();
@@ -1003,7 +1000,7 @@ QString FolderDefinition::absoluteJournalPath() const
 
 QString FolderDefinition::defaultJournalPath(AccountPtr account)
 {
-    return SyncJournalDb::makeDbName(localPath, account->url(), targetPath, account->credentials()->user());
+    return SyncJournalDb::makeDbName(account->url(), targetPath, account->credentials()->user());
 }
 
 } // namespace OCC

src/gui/folderman.cpp

@@ -235,22 +235,11 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
     foreach (const auto& folderAlias, settings.childGroups()) {
         FolderDefinition folderDefinition;
         if (FolderDefinition::load(settings, folderAlias, &folderDefinition)) {
-            auto defaultJournalPath = folderDefinition.defaultJournalPath(account->account());
-
             // Migration: Old settings don't have journalPath
             if (folderDefinition.journalPath.isEmpty()) {
-                folderDefinition.journalPath = defaultJournalPath;
+                folderDefinition.journalPath = folderDefinition.defaultJournalPath(account->account());
             }
-
-            // Migration: ._ files sometimes don't work
-            // So if the configured journalPath is the default one ("._sync_*.db")
-            // but the current default doesn't have the underscore, switch to the
-            // new default. See SyncJournalDb::makeDbName().
-            if (folderDefinition.journalPath.startsWith("._sync_")
-                && defaultJournalPath.startsWith(".sync_")) {
-                folderDefinition.journalPath = defaultJournalPath;
-            }
-
+            folderDefinition.defaultJournalPath(account->account());
             // Migration: If an old db is found, move it to the new name.
             if (backwardsCompatible) {
                 SyncJournalDb::maybeMigrateDb(folderDefinition.localPath, folderDefinition.absoluteJournalPath());

src/gui/folderstatusmodel.cpp

@@ -652,7 +652,7 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
         newInfo._size = job->_sizes.value(path);
         newInfo._isExternal = permissionMap.value(removeTrailingSlash(path)).toString().contains("M");
         newInfo._path = relativePath;
-        newInfo._name = removeTrailingSlash(relativePath).split('/').last();
+        newInfo._name = relativePath.split('/', QString::SkipEmptyParts).last();
 
         if (relativePath.isEmpty())
             continue;

src/gui/folderwatcher_linux.cpp

@@ -171,8 +171,7 @@ void FolderWatcherPrivate::slotReceivedNotification(int fd)
             // qDebug() << Q_FUNC_INFO << event->name;
             if (fileName.startsWith("._sync_") ||
                     fileName.startsWith(".csync_journal.db") ||
-                    fileName.startsWith(".owncloudsync.log") ||
-                    fileName.startsWith(".sync_")) {
+                    fileName.startsWith(".owncloudsync.log")) {
                 // qDebug() << "ignore journal";
             } else {
                 const QString p = _watches[event->wd] + '/' + fileName;

src/gui/generalsettings.ui

@@ -152,12 +152,6 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QLabel" name="aboutLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
         <property name="text">
          <string>About</string>
         </property>

src/gui/ignorelisteditor.cpp

@@ -48,9 +48,6 @@ IgnoreListEditor::IgnoreListEditor(QWidget *parent) :
                          "and cannot be modified in this view.")
             .arg(QDir::toNativeSeparators(cfgFile.excludeFile(ConfigFile::SystemScope)));
 
-    addPattern(".csync_journal.db*", /*deletable=*/false, /*readonly=*/true);
-    addPattern("._sync_*.db*", /*deletable=*/false, /*readonly=*/true);
-    addPattern(".sync_*.db*", /*deletable=*/false, /*readonly=*/true);
     readIgnoreFile(cfgFile.excludeFile(ConfigFile::SystemScope), true);
     readIgnoreFile(cfgFile.excludeFile(ConfigFile::UserScope), false);
 

src/gui/notificationwidget.cpp

@@ -125,8 +125,8 @@ void NotificationWidget::slotNotificationRequestFinished(int statusCode)
 
     QString timeStr = locale.toString(QTime::currentTime());
 
-    // the ocs API returns stat code 100 or 200 inside the xml if it succeeded.
-    if( statusCode != OCS_SUCCESS_STATUS_CODE && statusCode != OCS_SUCCESS_STATUS_CODE_V2 ) {
+    // the ocs API returns stat code 100 if it succeeded.
+    if( statusCode != OCS_SUCCESS_STATUS_CODE  ) {
         qDebug() << Q_FUNC_INFO << "Notification Request to Server failed, leave button visible.";
         for( i = 0; i < _buttons.count(); i++ ) {
             _buttons.at(i)->setEnabled(true);

src/gui/ocsjob.cpp

@@ -25,7 +25,6 @@ OcsJob::OcsJob(AccountPtr account)
 : AbstractNetworkJob(account, "")
 {
     _passStatusCodes.append(OCS_SUCCESS_STATUS_CODE);
-    _passStatusCodes.append(OCS_SUCCESS_STATUS_CODE_V2);
     setIgnoreCredentialFailure(true);
 }
 

src/gui/ocsjob.h

@@ -24,8 +24,6 @@
 #include <QUrl>
 
 #define OCS_SUCCESS_STATUS_CODE 100
-// Apparantly the v2.php URLs can return that
-#define OCS_SUCCESS_STATUS_CODE_V2 200
 
 namespace OCC {
 

src/gui/owncloudgui.cpp

@@ -174,31 +174,22 @@ void ownCloudGui::slotTrayClicked( QSystemTrayIcon::ActivationReason reason )
         last_click.start();
     }
 
-    // Left click
+    // A click on the tray icon should only open the status window on Win and
+    // Linux, not on Mac. They want a menu entry.
+#if !defined Q_OS_MAC
     if( reason == QSystemTrayIcon::Trigger ) {
-        if (OwncloudSetupWizard::bringWizardToFrontIfVisible()) {
-            // brought wizard to front
-        } else if (_shareDialogs.size() > 0) {
-            // Share dialog(s) be hidden by other apps, bring them back
-            Q_FOREACH(const QPointer<ShareDialog> &shareDialog, _shareDialogs) {
-                Q_ASSERT(shareDialog.data());
-                raiseDialog(shareDialog);
-            }
-        } else {
-#ifdef Q_OS_MAC
-            // on macOS, a left click always opens menu.
-            // However if the settings dialog is already visible but hidden
-            // by other applications, this will bring it to the front.
-            if (!_settingsDialog.isNull() && _settingsDialog->isVisible()) {
-                raiseDialog(_settingsDialog.data());
-            }
+        // Start settings if config is existing.
+        slotOpenSettingsDialog();
+    }
 #else
-            slotOpenSettingsDialog();
-#endif
+    // On Mac, if the settings dialog is already visible but hidden
+    // by other applications, this will bring it to the front.
+    if( reason == QSystemTrayIcon::Trigger ) {
+        if (!_settingsDialog.isNull() && _settingsDialog->isVisible()) {
+            slotShowSettings();
         }
     }
-    // FIXME: Also make sure that any auto updater dialogue https://github.com/owncloud/client/issues/5613
-    // or SSL error dialog also comes to front.
+#endif
 }
 
 void ownCloudGui::slotSyncStateChange( Folder* folder )

src/gui/owncloudsetupwizard.cpp

@@ -32,7 +32,6 @@
 #include "accountmanager.h"
 #include "clientproxy.h"
 #include "filesystem.h"
-#include "owncloudgui.h"
 
 #include "creds/credentialsfactory.h"
 #include "creds/abstractcredentials.h"
@@ -65,10 +64,10 @@ OwncloudSetupWizard::~OwncloudSetupWizard()
     _ocWizard->deleteLater();
 }
 
-static QPointer<OwncloudSetupWizard> wiz = 0;
-
 void OwncloudSetupWizard::runWizard(QObject* obj, const char* amember, QWidget *parent)
 {
+    static QPointer<OwncloudSetupWizard> wiz;
+
     if (!wiz.isNull()) {
         return;
     }
@@ -79,16 +78,6 @@ void OwncloudSetupWizard::runWizard(QObject* obj, const char* amember, QWidget *
     wiz->startWizard();
 }
 
-bool OwncloudSetupWizard::bringWizardToFrontIfVisible()
-{
-    if (wiz.isNull()) {
-        return false;
-    }
-
-    ownCloudGui::raiseDialog(wiz->_ocWizard);
-    return true;
-}
-
 void OwncloudSetupWizard::startWizard()
 {
     AccountPtr account = AccountManager::createAccount();
@@ -194,8 +183,6 @@ void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl& url, const QVariantM
                                              Utility::escape(CheckServerJob::versionString(info)),
                                              Utility::escape(serverVersion)));
 
-    // Note with newer servers we get the version actually only later in capabilities
-    // https://github.com/owncloud/core/pull/27473/files
     _ocWizard->account()->setServerVersion(serverVersion);
 
     QString p = url.path();
@@ -381,7 +368,6 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString& localFo
 
     bool nextStep = true;
     if( fi.exists() ) {
-        FileSystem::setFolderMinimumPermissions(localFolder);
         // there is an existing local folder. If its non empty, it can only be synced if the
         // ownCloud is newly created.
         _ocWizard->appendToConfigurationLog(

src/gui/owncloudsetupwizard.h

@@ -60,7 +60,6 @@ class OwncloudSetupWizard : public QObject
 public:
     /** Run the wizard */
     static void runWizard(QObject *obj, const char* amember, QWidget *parent = 0 );
-    static bool bringWizardToFrontIfVisible();
 signals:
     // overall dialog close signal.
     void ownCloudWizardDone( int );

src/gui/proxyauthhandler.cpp

@@ -81,14 +81,9 @@ void ProxyAuthHandler::handleProxyAuthenticationRequired(
     }
 
     // Find the responsible QNAM if possible.
-    QNetworkAccessManager* sending_qnam = 0;
-    QWeakPointer<QNetworkAccessManager> qnam_alive;
+    QNetworkAccessManager* sending_qnam = qobject_cast<QNetworkAccessManager*>(sender());
     if (Account* account = qobject_cast<Account*>(sender())) {
-        // Since we go into an event loop, it's possible for the account's qnam
-        // to be destroyed before we get back. We can use this to check for its
-        // liveness.
-        qnam_alive = account->sharedNetworkAccessManager();
-        sending_qnam = qnam_alive.data();
+        sending_qnam = account->networkAccessManager();
     }
     if (!sending_qnam) {
         qDebug() << "Could not get the sending QNAM for" << sender();
@@ -127,7 +122,6 @@ void ProxyAuthHandler::handleProxyAuthenticationRequired(
     qDebug() << "got creds for" << _proxy;
     authenticator->setUser(_username);
     authenticator->setPassword(_password);
-    sending_qnam = qnam_alive.data();
     if (sending_qnam) {
         _gaveCredentialsTo.insert(sending_qnam);
         connect(sending_qnam, SIGNAL(destroyed(QObject*)),

src/gui/servernotificationhandler.cpp

@@ -21,8 +21,6 @@
 namespace OCC
 {
 
-const QString notificationsPath = QLatin1String("ocs/v2.php/apps/notifications/api/v1/notifications");
-
 ServerNotificationHandler::ServerNotificationHandler(QObject *parent)
     : QObject(parent)
 {
@@ -49,7 +47,7 @@ void ServerNotificationHandler::slotFetchNotifications(AccountState *ptr)
     }
 
     // if the previous notification job has finished, start next.
-    _notificationJob = new JsonApiJob( ptr->account(), notificationsPath, this );
+    _notificationJob = new JsonApiJob( ptr->account(), QLatin1String("ocs/v2.php/apps/notifications/api/v1/notifications"), this );
     QObject::connect(_notificationJob.data(), SIGNAL(jsonReceived(QVariantMap, int)),
                      this, SLOT(slotNotificationsReceived(QVariantMap, int)));
     _notificationJob->setProperty("AccountStatePtr", QVariant::fromValue<AccountState*>(ptr));
@@ -96,16 +94,6 @@ void ServerNotificationHandler::slotNotificationsReceived(const QVariantMap& jso
 
             a._links.append(al);
         }
-
-        // Add another action to dismiss notification on server
-        // https://github.com/owncloud/notifications/blob/master/docs/ocs-endpoint-v1.md#deleting-a-notification-for-a-user
-        ActivityLink al;
-        al._label = tr("Dismiss");
-        al._link  = Utility::concatUrlPath(ai->account()->url(), notificationsPath + "/" + json.value("notification_id").toString()).toString();
-        al._verb  = "DELETE";
-        al._isPrimary = false;
-        a._links.append(al);
-
         list.append(a);
     }
     emit newNotificationList( list );

src/gui/sharedialog.cpp

@@ -32,8 +32,6 @@
 
 namespace OCC {
 
-static const int thumbnailSize = 40;
-
 ShareDialog::ShareDialog(QPointer<AccountState> accountState,
                          const QString &sharePath,
                          const QString &localPath,
@@ -69,7 +67,7 @@ ShareDialog::ShareDialog(QPointer<AccountState> accountState,
     QFileInfo f_info(_localPath);
     QFileIconProvider icon_provider;
     QIcon icon = icon_provider.icon(f_info);
-    _ui->label_icon->setPixmap(icon.pixmap(thumbnailSize, thumbnailSize));
+    _ui->label_icon->setPixmap(icon.pixmap(40,40));
 
     // Set filename
     QFileInfo lPath(_localPath);
@@ -215,7 +213,6 @@ void ShareDialog::slotThumbnailFetched(const int &statusCode, const QByteArray &
 
     QPixmap p;
     p.loadFromData(reply, "PNG");
-    p = p.scaledToHeight(thumbnailSize, Qt::SmoothTransformation);
     _ui->label_icon->setPixmap(p);
 }
 

src/gui/sharedialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>408</width>
-    <height>281</height>
+    <width>400</width>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -64,24 +64,7 @@
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="shareWidgetsLayout">
-     <property name="spacing">
-      <number>10</number>
-     </property>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+    <layout class="QVBoxLayout" name="shareWidgetsLayout"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">

src/gui/sharelinkwidget.ui

@@ -14,20 +14,11 @@
    <string>Share NewDocument.odt</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_shareLink">
+     <property name="topMargin">
+      <number>10</number>
+     </property>
      <item>
       <widget class="QCheckBox" name="checkBox_shareLink">
        <property name="text">
@@ -37,7 +28,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="errorLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@@ -90,19 +81,19 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
     <widget class="QWidget" name="widget_shareLink" native="true">
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="leftMargin">
        <number>20</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
-      <item row="4" column="0">
+      <item row="3" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="leftMargin">
          <number>20</number>
@@ -129,7 +120,7 @@
         </item>
        </layout>
       </item>
-      <item row="6" column="0">
+      <item row="5" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="leftMargin">
          <number>0</number>
@@ -150,7 +141,7 @@
         </item>
        </layout>
       </item>
-      <item row="3" column="0">
+      <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_password">
         <item>
          <widget class="QCheckBox" name="checkBox_password">
@@ -180,7 +171,7 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
+      <item row="0" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <property name="sizeConstraint">
          <enum>QLayout::SetDefaultConstraint</enum>
@@ -223,7 +214,7 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="0">
+      <item row="1" column="0">
        <widget class="QWidget" name="widget_editing" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_editing">
          <property name="leftMargin">
@@ -261,23 +252,10 @@
         </layout>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="publicLinkWarningLabel">
-        <property name="text">
-         <string>Anyone with the link has access to the file/folder</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::PlainText</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>

src/gui/shareusergroupwidget.cpp

@@ -280,16 +280,9 @@ void ShareUserGroupWidget::slotCompleterHighlighted(const QModelIndex & index)
 void ShareUserGroupWidget::displayError(int code, const QString& message)
 {
     _pi_sharee.stopAnimation();
-
-    // Also remove the spinner in the widget list, if any
-    foreach (auto pi, _ui->scrollArea->findChildren<QProgressIndicator*>()) {
-        delete pi;
-    }
-
     qDebug() << "Error from server" << code << message;
     _ui->errorLabel->setText(message);
     _ui->errorLabel->show();
-    _ui->shareeLineEdit->setEnabled(true);
 }
 
 ShareWidget::ShareWidget(QSharedPointer<Share> share,
@@ -331,11 +324,6 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
     QIcon icon(QLatin1String(":/client/resources/more.png"));
     _ui->permissionToolButton->setIcon(icon);
 
-    // If there's only a single entry in the detailed permission menu, hide it
-    if (menu->actions().size() == 1) {
-        _ui->permissionToolButton->hide();
-    }
-
     // Set the permissions checkboxes
     displayPermissions();
 

src/gui/shareusergroupwidget.ui

@@ -6,26 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>397</width>
-    <height>273</height>
+    <width>457</width>
+    <height>164</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Share NewDocument.odt</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item>
     <layout class="QHBoxLayout" name="shareeHorizontalLayout">
      <item>
@@ -106,8 +94,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>395</width>
-        <height>221</height>
+        <width>437</width>
+        <height>94</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3"/>

src/libsync/account.cpp

@@ -202,11 +202,6 @@ QNetworkAccessManager *Account::networkAccessManager()
     return _am.data();
 }
 
-QSharedPointer<QNetworkAccessManager> Account::sharedNetworkAccessManager()
-{
-    return _am;
-}
-
 QNetworkReply *Account::sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data)
 {
     req.setUrl(url);

src/libsync/account.h

@@ -145,21 +145,9 @@ public:
     const Capabilities &capabilities() const;
     void setCapabilities(const QVariantMap &caps);
 
-    /** Access the server version
-     *
-     * For servers >= 10.0.0, this can be the empty string until capabilities
-     * have been received.
-     */
+    /** Access the server version */
     QString serverVersion() const;
-
-    /** Server version for easy comparison.
-     *
-     * Example: serverVersionInt() >= makeServerVersion(11, 2, 3)
-     *
-     * Will be 0 if the version is not available yet.
-     */
     int serverVersionInt() const;
-
     static int makeServerVersion(int majorVersion, int minorVersion, int patchVersion);
     void setServerVersion(const QString &version);
 
@@ -185,7 +173,6 @@ public:
 
     void resetNetworkAccessManager();
     QNetworkAccessManager* networkAccessManager();
-    QSharedPointer<QNetworkAccessManager> sharedNetworkAccessManager();
 
     /// Called by network jobs on credential errors, emits invalidCredentials()
     void handleInvalidCredentials();

src/libsync/connectionvalidator.cpp

@@ -114,21 +114,26 @@ void ConnectionValidator::slotCheckServerAndAuth()
 
 void ConnectionValidator::slotStatusFound(const QUrl&url, const QVariantMap &info)
 {
-    // Newer servers don't disclose any version in status.php anymore
-    // https://github.com/owncloud/core/pull/27473/files
-    // so this string can be empty.
-    QString serverVersion = CheckServerJob::version(info);
-
     // status.php was found.
     qDebug() << "** Application: ownCloud found: "
              << url << " with version "
              << CheckServerJob::versionString(info)
-             << "(" << serverVersion << ")";
+             << "(" << CheckServerJob::version(info) << ")";
 
-    if (!serverVersion.isEmpty() && !setAndCheckServerVersion(serverVersion)) {
+    QString version = CheckServerJob::version(info);
+    _account->setServerVersion(version);
+
+    // We cannot deal with servers < 5.0.0
+    if (version.contains('.') && version.split('.')[0].toInt() < 5) {
+        _errors.append( tr("The configured server for this client is too old") );
+        _errors.append( tr("Please update to the latest server and restart the client.") );
+        reportResult( ServerVersionMismatch );
         return;
     }
 
+    // We attempt to work with servers >= 5.0.0 but warn users.
+    // Check usages of Account::serverVersionUnsupported() for details.
+
     // now check the authentication
     if (_account->credentials()->ready())
         QTimer::singleShot( 0, this, SLOT( checkAuthentication() ));
@@ -230,13 +235,6 @@ void ConnectionValidator::slotCapabilitiesRecieved(const QVariantMap &json)
     auto caps = json.value("ocs").toMap().value("data").toMap().value("capabilities");
     qDebug() << "Server capabilities" << caps;
     _account->setCapabilities(caps.toMap());
-
-    // New servers also report the version in the capabilities
-    QString serverVersion = caps.toMap()["core"].toMap()["status"].toMap()["version"].toString();
-    if (!serverVersion.isEmpty() && !setAndCheckServerVersion(serverVersion)) {
-        return;
-    }
-
     fetchUser();
 }
 
@@ -249,26 +247,6 @@ void ConnectionValidator::fetchUser()
     job->start();
 }
 
-bool ConnectionValidator::setAndCheckServerVersion(const QString& version)
-{
-    qDebug() << _account->url() << "has server version" << version;
-    _account->setServerVersion(version);
-
-    // We cannot deal with servers < 5.0.0
-    if (_account->serverVersionInt()
-            && _account->serverVersionInt() < Account::makeServerVersion(5, 0, 0)) {
-        _errors.append( tr("The configured server for this client is too old") );
-        _errors.append( tr("Please update to the latest server and restart the client.") );
-        reportResult( ServerVersionMismatch );
-        return false;
-    }
-
-    // We attempt to work with servers >= 5.0.0 but warn users.
-    // Check usages of Account::serverVersionUnsupported() for details.
-
-    return true;
-}
-
 void ConnectionValidator::slotUserFetched(const QVariantMap &json)
 {
     QString user = json.value("ocs").toMap().value("data").toMap().value("id").toString();

src/libsync/connectionvalidator.h

@@ -125,12 +125,6 @@ private:
     void checkServerCapabilities();
     void fetchUser();
 
-    /** Sets the account's server version
-     *
-     * Returns false and reports ServerVersionMismatch for very old servers.
-     */
-    bool setAndCheckServerVersion(const QString& version);
-
     QStringList _errors;
     AccountPtr   _account;
     bool _isCheckingServerAndAuth;

src/libsync/filesystem.cpp

@@ -52,14 +52,12 @@ namespace OCC {
 
 QString FileSystem::longWinPath( const QString& inpath )
 {
+    QString path(inpath);
+
 #ifdef Q_OS_WIN
-    const char *unc_str = c_path_to_UNC(inpath.toUtf8());
-    QString path = QString::fromUtf8(unc_str);
-    free((void*)unc_str);
-    return path;
-#else
-    return inpath;
+    path = QString::fromWCharArray( static_cast<wchar_t*>( c_utf8_path_to_locale(inpath.toUtf8() ) ) );
 #endif
+    return path;
 }
 
 bool FileSystem::fileEquals(const QString& fn1, const QString& fn2)

src/libsync/networkjobs.cpp

@@ -474,7 +474,10 @@ bool CheckServerJob::finished()
         }
 
         qDebug() << "status.php returns: " << status << " " << reply()->error() << " Reply: " << reply();
-        if( status.contains("installed") ) {
+        if( status.contains("installed")
+                && status.contains("version")
+                && status.contains("versionstring") ) {
+
             emit instanceFound(reply()->url(), status);
         } else {
             qDebug() << "No proper answer on " << reply()->url();

src/libsync/owncloudtheme.cpp

@@ -46,7 +46,7 @@ QString ownCloudTheme::about() const
 {
     QString devString;
     devString = trUtf8("<p>Version %2. For more information visit <a href=\"%3\">https://%4</a></p>"
-               "<p>For known issues and help, please visit: <a href=\"https://central.owncloud.org/c/desktop-client\">https://central.owncloud.org</a></p>"
+               "<p>For known issues and help, please visit: <a href=\"https://central.owncloud.org/c/help/desktop-file-sync\">https://central.owncloud.org</a></p>"
                "<p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, "
                " Jan-Christoph Borchardt, and others.</small></p>"
                "<p>Copyright ownCloud GmbH</p>"

src/libsync/ownsql.cpp

@@ -17,8 +17,6 @@
 #include <QString>
 #include <QDebug>
 #include <QFile>
-#include <QFileInfo>
-#include <QDir>
 
 #include "ownsql.h"
 #include "utility.h"
@@ -57,12 +55,6 @@ bool SqlDatabase::openHelper( const QString& filename, int sqliteFlags )
 
     if( _errId != SQLITE_OK ) {
         qDebug() << "Error:" << _error << "for" << filename;
-        if (_errId == SQLITE_CANTOPEN) {
-            qDebug() << "CANTOPEN extended errcode: " << sqlite3_extended_errcode(_db);
-#if SQLITE_VERSION_NUMBER >= 3012000
-            qDebug() << "CANTOPEN system errno: " << sqlite3_system_errno(_db);
-#endif
-        }
         close();
         return false;
     }
@@ -109,8 +101,8 @@ bool SqlDatabase::openOrCreateReadWrite( const QString& filename )
 
     if( !checkDb() ) {
         // When disk space is low, checking the db may fail even though it's fine.
-        qint64 freeSpace = Utility::freeDiskSpace(QFileInfo(filename).dir().absolutePath());
-        if (freeSpace != -1 && freeSpace < 1000000) {
+        qint64 freeSpace = Utility::freeDiskSpace(filename);
+        if (freeSpace < 1000000) {
             qDebug() << "Consistency check failed, disk space is low, aborting" << freeSpace;
             close();
             return false;

src/libsync/propagatedownload.cpp

@@ -231,8 +231,6 @@ qint64 GETFileJob::currentDownloadPosition()
 
 void GETFileJob::slotReadyRead()
 {
-    if (!reply())
-        return;
     int bufferSize = qMin(1024*8ll , reply()->bytesAvailable());
     QByteArray buffer(bufferSize, Qt::Uninitialized);
 
@@ -500,11 +498,6 @@ void PropagateDownloadFile::slotGetFinished()
         } else if (fileNotFound) {
             job->setErrorString(tr("File was deleted from server"));
             job->setErrorStatus(SyncFileItem::SoftError);
-
-            // As a precaution against bugs that cause our database and the
-            // reality on the server to diverge, rediscover this folder on the
-            // next sync run.
-            propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
         }
 
         SyncFileItem::Status status = job->errorStatus();

src/libsync/propagateuploadng.cpp

@@ -292,8 +292,6 @@ void PropagateUploadFileNG::startNextChunk()
                 _transmissionChecksumType, _transmissionChecksum);
         }
 
-        headers["OC-Total-Length"] = QByteArray::number(fileSize);
-
         auto job = new MoveJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), "/.file"),
                                destination, headers, this);
         _jobs.append(job);

src/libsync/syncengine.cpp

@@ -386,10 +386,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
 
     if (item->_instruction == CSYNC_INSTRUCTION_NONE
             || (item->_instruction == CSYNC_INSTRUCTION_IGNORE && instruction != CSYNC_INSTRUCTION_NONE)) {
-        // Take values from side (local/remote) where instruction is not _NONE
         item->_instruction = instruction;
         item->_modtime = file->modtime;
-        item->_size = file->size;
     } else {
         if (instruction != CSYNC_INSTRUCTION_NONE) {
             qWarning() << "ERROR: Instruction" << item->_instruction << "vs" << instruction << "for" << fileUtf8;
@@ -519,7 +517,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
     if (file->etag && file->etag[0]) {
         item->_etag = file->etag;
     }
-
+    item->_size = file->size;
 
     if (!item->_inode) {
         item->_inode = file->inode;

src/libsync/syncjournaldb.cpp

@@ -17,7 +17,6 @@
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QUrl>
-#include <QDir>
 
 #include "ownsql.h"
 
@@ -42,8 +41,7 @@ SyncJournalDb::SyncJournalDb(const QString& dbFilePath, QObject *parent) :
 
 }
 
-QString SyncJournalDb::makeDbName(const QString& localPath,
-                                  const QUrl& remoteUrl,
+QString SyncJournalDb::makeDbName(const QUrl& remoteUrl,
                                   const QString& remotePath,
                                   const QString& user)
 {
@@ -58,42 +56,6 @@ QString SyncJournalDb::makeDbName(const QString& localPath,
     journalPath.append( ba.left(6).toHex() );
     journalPath.append(".db");
 
-    // If the journal doesn't exist and we can't create a file
-    // at that location, try again with a journal name that doesn't
-    // have the ._ prefix.
-    //
-    // The disadvantage of that filename is that it will only be ignored
-    // by client versions >2.3.2.
-    //
-    // See #5633: "._*" is often forbidden on samba shared folders.
-
-    // If it exists already, the path is clearly usable
-    QFile file(QDir(localPath).filePath(journalPath));
-    if (file.exists()) {
-        return journalPath;
-    }
-
-    // Try to create a file there
-    if (file.open(QIODevice::ReadWrite)) {
-        // Ok, all good.
-        file.close();
-        file.remove();
-        return journalPath;
-    }
-
-    // Can we create it if we drop the underscore?
-    QString alternateJournalPath = journalPath.mid(2).prepend(".");
-    QFile file2(QDir(localPath).filePath(alternateJournalPath));
-    if (file2.open(QIODevice::ReadWrite)) {
-        // The alternative worked, use it
-        qDebug() << "Using alternate database path" << alternateJournalPath;
-        file2.close();
-        file2.remove();
-        return alternateJournalPath;
-    }
-
-    // Neither worked, just keep the original and throw errors later
-    qDebug() << "Could not find a writable database path" << file.fileName();
     return journalPath;
 }
 

src/libsync/syncjournaldb.h

@@ -41,8 +41,7 @@ public:
     virtual ~SyncJournalDb();
 
     /// Create a journal path for a specific configuration
-    static QString makeDbName(const QString& localPath,
-                              const QUrl& remoteUrl,
+    static QString makeDbName(const QUrl& remoteUrl,
                               const QString& remotePath,
                               const QString& user);
 
@@ -137,14 +136,6 @@ public:
     /**
      * Make sure that on the next sync, fileName is not read from the DB but uses the PROPFIND to
      * get the info from the server
-     *
-     * Specifically, this sets the md5 field of fileName and all its parents to _invalid_.
-     * That causes a metadata difference and a resulting discovery from the remote for the
-     * affected folders.
-     *
-     * Since folders in the selective sync list will not be rediscovered (csync_ftw,
-     * _csync_detect_update skip them), the _invalid_ marker will stay and it. And any
-     * child items in the db will be ignored when reading a remote tree from the database.
      */
     void avoidReadFromDbOnNextSync(const QString& fileName);
 

src/libsync/utility.cpp

@@ -122,8 +122,8 @@ QString Utility::octetsToString( qint64 octets )
     QString s;
     qreal value = octets;
 
-    // Whether we care about decimals: only for GB/MB and only
-    // if it's less than 10 units.
+    // Whether we care about decimals: only for GB and only
+    // if it's less than 10 GB.
     bool round = true;
 
     // do not display terra byte with the current units, as when
@@ -137,7 +137,6 @@ QString Utility::octetsToString( qint64 octets )
     } else if (octets >= mb) {
         s = QCoreApplication::translate("Utility", "%L1 MB");
         value /= mb;
-        round = false;
     } else if (octets >= kb) {
         s = QCoreApplication::translate("Utility", "%L1 KB");
         value /= kb;

src/libsync/utility.h

@@ -43,12 +43,6 @@ namespace Utility
     OWNCLOUDSYNC_EXPORT QByteArray userAgentString();
     OWNCLOUDSYNC_EXPORT bool hasLaunchOnStartup(const QString &appName);
     OWNCLOUDSYNC_EXPORT void setLaunchOnStartup(const QString &appName, const QString& guiName, bool launch);
-
-    /**
-     * Return the amount of free space available.
-     *
-     * \a path must point to a directory
-     */
     OWNCLOUDSYNC_EXPORT qint64 freeDiskSpace(const QString &path);
 
     /**

test/CMakeLists.txt

@@ -25,6 +25,7 @@ list(APPEND FolderWatcher_SRC ../src/gui/socketapisocket_mac.mm)
 ENDIF()
 owncloud_add_test(CSyncSqlite "")
 owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp)
+owncloud_add_test(OwnSql "")
 owncloud_add_test(SyncJournalDB "")
 owncloud_add_test(SyncFileItem "")
 owncloud_add_test(ConcatUrl "")
@@ -34,7 +35,6 @@ owncloud_add_test(ChecksumValidator "")
 owncloud_add_test(ExcludedFiles "")
 if(HAVE_QT5 AND NOT BUILD_WITH_QT4)
     owncloud_add_test(FileSystem "")
-    owncloud_add_test(OwnSql "")
     owncloud_add_test(Utility "")
     owncloud_add_test(SyncEngine "syncenginetestutils.h")
     owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h")

test/testownsql.cpp

@@ -12,18 +12,37 @@
 
 using namespace OCC;
 
+namespace {
+
+const char testdbC[] = "/tmp/testdb.sqlite";
+}
+
 class TestOwnSql : public QObject
 {
     Q_OBJECT
-    QTemporaryDir _tempDir;
 
 private slots:
+    void initTestCase() {
+        QFileInfo fi( testdbC );
+
+        if( fi.exists() ) {
+            QFile::remove(testdbC);
+        }
+        fi.refresh();
+        QVERIFY(!fi.exists());
+    }
+
+    void cleanupTestCase() {
+        // QFile::remove(testdbC);
+    }
+
     void testOpenDb() {
-        QFileInfo fi( _tempDir.path() + "/testdb.sqlite" );
+        QFileInfo fi( testdbC );
         QVERIFY( !fi.exists() ); // must not exist
-        _db.openOrCreateReadWrite(fi.filePath());
+        _db.openOrCreateReadWrite(testdbC);
         fi.refresh();
         QVERIFY(fi.exists());
+
     }
 
     void testCreate() {

test/testsyncengine.cpp

@@ -213,49 +213,6 @@ private slots:
         }
     }
 
-    void testSelectiveSyncBug() {
-        // issue owncloud/enterprise#1965: files from selective-sync ignored
-        // folders are uploaded anyway is some circumstances.
-        FakeFolder fakeFolder{FileInfo{ QString(), {
-            FileInfo { QStringLiteral("parentFolder"), {
-                FileInfo{ QStringLiteral("subFolder"), {
-                    { QStringLiteral("fileA.txt"), 400 },
-                    { QStringLiteral("fileB.txt"), 400, 'o' }
-                }}
-            }}
-        }}};
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-        auto expectedServerState = fakeFolder.currentRemoteState();
-
-        // Remove subFolder with selectiveSync:
-        fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
-                                                                {"parentFolder/subFolder/"});
-        fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync("parentFolder/subFolder/");
-
-        // But touch a local file before the next sync, such that the local folder
-        // can't be removed
-        fakeFolder.localModifier().setContents("parentFolder/subFolder/fileB.txt", 'n');
-
-        // Several follow-up syncs don't change the state at all,
-        // in particular the remote state doesn't change and fileB.txt
-        // isn't uploaded.
-
-        for (int i = 0; i < 3; ++i) {
-            fakeFolder.syncOnce();
-
-            {
-                // Nothing changed on the server
-                QCOMPARE(fakeFolder.currentRemoteState(), expectedServerState);
-                // The local state should still have subFolderA
-                auto local = fakeFolder.currentLocalState();
-                QVERIFY(local.find("parentFolder/subFolder"));
-                QVERIFY(local.find("parentFolder/subFolder/fileA.txt"));
-                QVERIFY(local.find("parentFolder/subFolder/fileB.txt"));
-            }
-        }
-    }
-
     void abortAfterFailedMkdir() {
         QSKIP("Skip for 2.3");
         FakeFolder fakeFolder{FileInfo{}};

test/testsyncjournaldb.cpp

@@ -17,11 +17,10 @@ class TestSyncJournalDB : public QObject
 {
     Q_OBJECT
 
-    QTemporaryDir _tempDir;
 public:
-    TestSyncJournalDB() : _db((_tempDir.path() + "/sync.db"))
+    TestSyncJournalDB()
+        : _db("/tmp/csync-test.db")
     {
-        QVERIFY(_tempDir.isValid());
     }
 
     QDateTime dropMsecs(QDateTime time)

test/testutility.cpp

@@ -40,7 +40,7 @@ private slots:
         QCOMPARE(octetsToString(10240) , QString("10 KB"));
 
         QCOMPARE(octetsToString(123456) , QString("121 KB"));
-        QCOMPARE(octetsToString(1234567) , QString("1.2 MB"));
+        QCOMPARE(octetsToString(1234567) , QString("1 MB"));
         QCOMPARE(octetsToString(12345678) , QString("12 MB"));
         QCOMPARE(octetsToString(123456789) , QString("118 MB"));
         QCOMPARE(octetsToString(1000LL*1000*1000 * 5) , QString("4.7 GB"));