VERSION.cmake: 2.3.2 rc1

ChangeLog: 2.4.3
Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
2026-04-03 09:11:33 +02:00 · 2018-08-09 16:36:01 +02:00 · 2018-08-09 16:33:43 +02:00 · 2018-08-09 15:31:47 +02:00 · 2018-08-09 13:49:10 +02:00 · 2018-08-07 09:56:45 +02:00
6 changed files with 17 additions and 10 deletions
--- a/8
+++ b/8
@@ -1,7 +1,13 @@
 ChangeLog
 =========

-version 2.4.2 (2018-06-xx)
+version 2.4.3 (2018-08-xx)
+* Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY (#6696, #6610)
+* OAuth2: Fix infinite loop when the refresh token is expired
+* Windows MSI: Fix crash in the auto updater
+* Nautilus: Guard against None state (#6643)
+
+version 2.4.2 (2018-07-18)
 * Linux: Tray workarounds (#6545)
 * Fix nautilus/nemo shell issues (#6393, #6406)
 * Updater: Add update channel feature (#6259)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 4 )
-set( MIRALL_VERSION_PATCH 2 )
+set( MIRALL_VERSION_PATCH 3 )
 set( MIRALL_VERSION_YEAR  2018 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "git") #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 )
--- a/shell_integration/nautilus/syncstate.py
+++ b/shell_integration/nautilus/syncstate.py
@@ -214,8 +214,8 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
        # and we definitely don't want to show them for IGNORED.
        shareable = False
        state = entry['state']
-        state_ok = state.startswith('OK')
-        state_sync = state.startswith('SYNC')
+        state_ok = state and state.startswith('OK')
+        state_sync = state and state.startswith('SYNC')
        if state_ok:
            shareable = True
        elif state_sync and isDir:
--- a/src/csync/vio/csync_vio_local_win.cpp
+++ b/src/csync/vio/csync_vio_local_win.cpp
@@ -181,7 +181,7 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
      }
    } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE
                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE
-                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) {
+              ) {
        file_stat->type = CSYNC_FTW_TYPE_SKIP;
    } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
        file_stat->type = CSYNC_FTW_TYPE_DIR;
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -283,7 +283,7 @@ void OCUpdater::slotStartInstaller()
            return QDir::toNativeSeparators(path);
        };

-        auto msiLogFile = cfg.configPath() + "msi.log";
+        QString msiLogFile = cfg.configPath() + "msi.log";
        QString command = QString("&{msiexec /norestart /passive /i '%1' /L*V '%2'| Out-Null ; &'%3'}")
             .arg(preparePathForPowershell(updateFile))
             .arg(preparePathForPowershell(msiLogFile))
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -379,11 +379,12 @@ bool HttpCredentials::refreshAccessToken()
        QJsonParseError jsonParseError;
        QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object();
        QString accessToken = json["access_token"].toString();
-        if (reply->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError || json.isEmpty()) {
-            // Network error maybe?
+        if (jsonParseError.error != QJsonParseError::NoError || json.isEmpty()) {
+            // Invalid or empty JSON: Network error maybe?
            qCWarning(lcHttpCredentials) << "Error while refreshing the token" << reply->errorString() << jsonData << jsonParseError.errorString();
        } else if (accessToken.isEmpty()) {
-            // The token is no longer valid.
+            // If the json was valid, but the reply did not contain an access token, the token
+            // is considered expired. (Usually the HTTP reply code is 400)
            qCDebug(lcHttpCredentials) << "Expired refresh token. Logging out";
            _refreshToken.clear();
        } else {
Author	SHA1	Message	Date
Markus Goetz	dca63dc539	VERSION.cmake: 2.3.2 rc1	2018-08-09 16:36:01 +02:00
Markus Goetz	b5384c9ad7	ChangeLog: 2.4.3	2018-08-09 16:33:43 +02:00
Markus Goetz	8c77bfad93	Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY Too many applications incorrectly use this attribute. For #6696 #6610 (cherry picked from commit `d0bdccc60a`)	2018-08-09 15:31:47 +02:00
Olivier Goffart	235e314da7	OAuth: Fix infinite loop when the refresh token is expired The server reply with a code 400 when the token is invalid, the client was understanding this error as a network error, and was retying again with the same token. Instead, we must rely on what the json is saying, even if the reply is not a 200 code. Issue https://github.com/owncloud/enterprise/issues/2777 (cherry picked from commit `eb7e074795`)	2018-08-09 13:49:10 +02:00
Olivier Goffart	628daeadfe	MSI: Fix crash in the auto updater 'auto' here is a QStringBuilder referencing a temporary Ammend commit `150d4f5935` (MSI: Always with logfile #6609) Found in the crash reporter: https://sentry.io/owncloud/desktop-win-and-mac/issues/623245771/ (cherry picked from commit `45bf2e9023`)	2018-08-07 09:56:45 +02:00
Christian Kamm	2a55b20b8d	Nautilus: Guard against None state #6643 It seems None gets assigned to 'state' in some paths. (cherry picked from commit `c9e97c12cd`)	2018-07-16 10:19:50 +02:00
Markus Goetz	6c818ac3c7	VERSION.cmake: This is now 2.4.3	2018-07-09 11:05:14 +02:00