VERSION.cmake: 2.3.1

ChangeLog

@@ -1,14 +1,7 @@
 ChangeLog
 =========
 
-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, X-OC-Total-Size)
-* 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)

VERSION.cmake

@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 3 )
-set( MIRALL_VERSION_PATCH 2 )
+set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_VERSION_YEAR  2017 )
 set( MIRALL_SOVERSION 0 )
 

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,7 +17,7 @@ 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_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"

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/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::

mirall.desktop.in

@@ -802,162 +802,6 @@ 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
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -1010,7 +854,7 @@ 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@

src/cmd/cmd.cpp

@@ -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/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();

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/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/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">
@@ -97,7 +88,7 @@
        <number>20</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="rightMargin">
        <number>0</number>

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/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/ownsql.cpp

@@ -17,8 +17,6 @@
 #include <QString>
 #include <QDebug>
 #include <QFile>
-#include <QFileInfo>
-#include <QDir>
 
 #include "ownsql.h"
 #include "utility.h"
@@ -103,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);
 

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/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/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"));