Merge branch 'master' into bugfix/pauseSync

Author: Rello

resources.qrc

@@ -63,7 +63,9 @@
         <file>src/gui/wizard/qml/AccountWizardWindow.qml</file>
         <file>src/gui/wizard/qml/AdvancedOptionsDialog.qml</file>
         <file>src/gui/wizard/qml/BasicAuthPage.qml</file>
+        <file>src/gui/wizard/qml/BrowserAuthFooter.qml</file>
         <file>src/gui/wizard/qml/BrowserAuthPage.qml</file>
+        <file>src/gui/wizard/qml/BrowserReAuthWindow.qml</file>
         <file>src/gui/wizard/qml/ClientCertificateDialog.qml</file>
         <file>src/gui/wizard/qml/OptionRow.qml</file>
         <file>src/gui/wizard/qml/ProxySettingsDialog.qml</file>

src/3rdparty/QProgressIndicator/QProgressIndicator.cpp

@@ -698,8 +698,14 @@ Utility::Handle lockFile(const QString &fileName, FileSystem::LockMode mode)
     DWORD attr = GetFileAttributesW(reinterpret_cast<const wchar_t *>(fName.utf16()));
     if (attr != INVALID_FILE_ATTRIBUTES) {
         // Try to open the file with as much access as possible..
-        auto out = Utility::Handle{CreateFileW(reinterpret_cast<const wchar_t *>(fName.utf16()), accessMode, shareMode, nullptr, OPEN_EXISTING,
-                                               FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, nullptr)};
+        const auto createFileResult = CreateFileW(reinterpret_cast<const wchar_t *>(fName.utf16()), accessMode, shareMode, nullptr, OPEN_EXISTING,
+                                                  FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+
+        if (createFileResult == INVALID_HANDLE_VALUE) {
+            return {};
+        }
+
+        auto out = Utility::Handle{createFileResult};
 
         if (out) {
             if (attr & FILE_ATTRIBUTE_DIRECTORY) {
@@ -713,9 +719,6 @@ Utility::Handle lockFile(const QString &fileName, FileSystem::LockMode mode)
             LARGE_INTEGER end;
             end.QuadPart = -1;
             if (LockFile(out.handle(), start.LowPart, start.HighPart, end.LowPart, end.HighPart)) {
-                // Lock acquired -> release it immediately
-                // just closing a file handle does not immediately release the lock leading to system instability
-                UnlockFile(out.handle(), start.LowPart, start.HighPart, end.LowPart, end.HighPart);
                 return out;
             } else {
                 return {};
@@ -733,11 +736,26 @@ bool FileSystem::isFileLocked(const QString &fileName, LockMode mode)
 {
 #ifdef Q_OS_WIN
     const auto handle = lockFile(fileName, mode);
-    if (!handle) {
+    if (handle) {
+        // Lock acquired -> release it immediately
+        // just closing a file handle does not immediately release the lock leading to system instability
+
+        LARGE_INTEGER start;
+        start.QuadPart = 0;
+        LARGE_INTEGER end;
+        end.QuadPart = -1;
+        if (!UnlockFile(handle, start.LowPart, start.HighPart, end.LowPart, end.HighPart)) {
+            const auto error = GetLastError();
+            qCWarning(lcFileSystem()) << "unlock file" << fileName << mode;
+            qCWarning(lcFileSystem()) << Q_FUNC_INFO << Utility::formatWinError(error) << fileName;
+        }
+    } else {
         const auto error = GetLastError();
+
         if (error == ERROR_SHARING_VIOLATION || error == ERROR_LOCK_VIOLATION) {
             return true;
-        } else if (error != ERROR_FILE_NOT_FOUND && error != ERROR_PATH_NOT_FOUND) {
+        } else {
+            qCWarning(lcFileSystem()) << "lock file" << fileName << mode;
             qCWarning(lcFileSystem()) << Q_FUNC_INFO << Utility::formatWinError(error) << fileName;
         }
     }

src/3rdparty/QProgressIndicator/QProgressIndicator.h

@@ -53,7 +53,6 @@ set(client_UI_SRCS
     proxyauthdialog.ui
     mnemonicdialog.ui
     vfsdownloaderrordialog.ui
-    wizard/flow2authwidget.ui
 )
 
 qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
@@ -259,16 +258,12 @@ set(client_SRCS
     creds/flow2auth.cpp
     creds/webflowcredentials.h
     creds/webflowcredentials.cpp
-    creds/webflowcredentialsdialog.h
-    creds/webflowcredentialsdialog.cpp
     wizard/accountwizardcontroller.h
     wizard/accountwizardcontroller.cpp
-    wizard/flow2authwidget.h
-    wizard/flow2authwidget.cpp
-    wizard/providersignuppage.h
-    wizard/providersignuppage.cpp
-    wizard/linklabel.h
-    wizard/linklabel.cpp
+    wizard/browserreauthcontroller.h
+    wizard/browserreauthcontroller.cpp
+    wizard/browserreauthwindow.h
+    wizard/browserreauthwindow.cpp
     integration/fileactionsmodel.h
     integration/fileactionsmodel.cpp
     )
@@ -424,8 +419,6 @@ IF( APPLE )
 ENDIF()
 
 set(3rdparty_SRC
-    ../3rdparty/QProgressIndicator/QProgressIndicator.h
-    ../3rdparty/QProgressIndicator/QProgressIndicator.cpp
     ../3rdparty/kmessagewidget/kmessagewidget.h
     ../3rdparty/kmessagewidget/kmessagewidget.cpp
     ../3rdparty/kirigami/wheelhandler.h
@@ -625,7 +618,6 @@ set_target_properties(nextcloudCore
 
 target_include_directories(nextcloudCore
   PUBLIC
-  ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
   ${CMAKE_SOURCE_DIR}/src/3rdparty/kirigami
   ${CMAKE_SOURCE_DIR}/src/3rdparty/kmessagewidget
   ${CMAKE_CURRENT_BINARY_DIR}

src/3rdparty/QProgressIndicator/README.md

@@ -11,6 +11,8 @@ import Style
 ApplicationWindow {
     id: root
 
+    property bool minimizable: false
+
     LayoutMirroring.enabled: Application.layoutDirection === Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
@@ -19,6 +21,7 @@ ApplicationWindow {
         | Qt.WindowTitleHint
         | Qt.WindowSystemMenuHint
         | Qt.WindowCloseButtonHint
+        | (root.minimizable ? Qt.WindowMinimizeButtonHint : 0)
     color: Style.wizardWindowBackground
     palette.window: Style.wizardWindowBackground
     palette.base: Style.wizardFieldBackground