community/nextcloud-client: upgrade to 2.6.0

1 files changed, 175 insertions, 68 deletions

diff --git a/community/nextcloud-client/remove-qtwebengine.patch b/community/nextcloud-client/remove-qtwebengine.patch
index 762b5092d5..09133a1eb6 100644
--- a/community/nextcloud-client/remove-qtwebengine.patch
+++ b/community/nextcloud-client/remove-qtwebengine.patch
@@ -1,6 +1,8 @@
---- desktop-2.5.2/src/CMakeLists.txt	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/CMakeLists.txt	2019-04-22 04:01:31.260028906 +0000
-@@ -4,7 +4,7 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e14c97e..f6c4180 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,7 +4,7 @@ endif()
  
  set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
  
@@ -9,26 +11,38 @@
  if (Qt5Core_VERSION VERSION_LESS 5.9.0)
  message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
  endif()
---- desktop-2.5.2/src/gui/CMakeLists.txt	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/gui/CMakeLists.txt	2019-04-22 04:15:53.230034980 +0000
-@@ -40,7 +40,6 @@
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index e806beb..e56a811 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -39,11 +39,8 @@ set(client_UI_SRCS
+     wizard/owncloudconnectionmethoddialog.ui
+     wizard/owncloudhttpcredspage.ui
      wizard/owncloudoauthcredspage.ui
+-    wizard/flow2authcredspage.ui
+-    wizard/flow2authwidget.ui
      wizard/owncloudsetupnocredspage.ui
      wizard/owncloudwizardresultpage.ui
 -    wizard/webview.ui
  )
  
  set(client_SRCS
-@@ -103,8 +102,6 @@
+@@ -107,23 +104,16 @@ set(client_SRCS
      creds/credentialsfactory.cpp
      creds/httpcredentialsgui.cpp
      creds/oauth.cpp
+-    creds/flow2auth.cpp
 -    creds/webflowcredentials.cpp
 -    creds/webflowcredentialsdialog.cpp
      wizard/postfixlineedit.cpp
      wizard/abstractcredswizardpage.cpp
      wizard/owncloudadvancedsetuppage.cpp
-@@ -115,8 +112,6 @@
+     wizard/owncloudconnectionmethoddialog.cpp
+     wizard/owncloudhttpcredspage.cpp
+     wizard/owncloudoauthcredspage.cpp
+-    wizard/flow2authcredspage.cpp
+-    wizard/flow2authwidget.cpp
+     wizard/owncloudsetuppage.cpp
      wizard/owncloudwizardcommon.cpp
      wizard/owncloudwizard.cpp
      wizard/owncloudwizardresultpage.cpp
@@ -37,7 +51,7 @@
      wizard/slideshow.cpp
  )
  
-@@ -295,7 +290,7 @@
+@@ -306,7 +296,7 @@ else()
  endif()
  
  add_library(updater STATIC ${updater_SRCS})
@@ -46,9 +60,11 @@
  target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
  
  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
---- desktop-2.5.2/src/gui/accountmanager.cpp	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/gui/accountmanager.cpp	2019-04-22 04:17:04.440035482 +0000
-@@ -253,20 +253,6 @@
+diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
+index ca00a4e..25e6a8b 100644
+--- a/src/gui/accountmanager.cpp
++++ b/src/gui/accountmanager.cpp
+@@ -253,20 +253,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
          acc->setUrl(urlConfig.toUrl());
      }
  
@@ -69,8 +85,10 @@
      qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType;
  
      acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
---- desktop-2.5.2/src/gui/creds/credentialsfactory.cpp	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/gui/creds/credentialsfactory.cpp	2019-04-22 04:23:19.590038126 +0000
+diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp
+index 6062f70..52e003b 100644
+--- a/src/gui/creds/credentialsfactory.cpp
++++ b/src/gui/creds/credentialsfactory.cpp
 @@ -21,7 +21,6 @@
  #ifndef NO_SHIBBOLETH
  #include "creds/shibbolethcredentials.h"
@@ -79,7 +97,7 @@
  
  namespace OCC {
  
-@@ -40,8 +39,6 @@
+@@ -40,8 +39,6 @@ namespace CredentialsFactory {
          } else if (type == "shibboleth") {
              return new ShibbolethCredentials;
  #endif
@@ -88,17 +106,66 @@
          } else {
              qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type));
              return new DummyCredentials;
---- desktop-2.5.2/src/gui/wizard/owncloudwizard.cpp	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/gui/wizard/owncloudwizard.cpp	2019-04-22 04:24:59.360038829 +0000
-@@ -26,7 +26,6 @@
+diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
+index 3d20344..5785cad 100644
+--- a/src/gui/owncloudsetupwizard.cpp
++++ b/src/gui/owncloudsetupwizard.cpp
+@@ -408,7 +408,7 @@ void OwncloudSetupWizard::slotAuthError()
+     }
+ 
+     _ocWizard->show();
+-    if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds || _ocWizard->currentId() == WizardCommon::Page_Flow2AuthCreds) {
++    if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds) {
+         _ocWizard->back();
+     }
+     _ocWizard->displayError(errorMsg, _ocWizard->currentId() == WizardCommon::Page_ServerSetup && checkDowngradeAdvised(reply));
+diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
+index 3a956b0..8b32b5b 100644
+--- a/src/gui/wizard/owncloudsetuppage.cpp
++++ b/src/gui/wizard/owncloudsetuppage.cpp
+@@ -143,7 +143,7 @@ void OwncloudSetupPage::slotLogin()
+ void OwncloudSetupPage::slotGotoProviderList()
+ {
+     _ocWizard->setRegistration(true);
+-    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
++    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::OAuth);
+     _authTypeKnown = true;
+     _checking = false;
+     emit completeChanged();
+@@ -258,12 +258,8 @@ int OwncloudSetupPage::nextId() const
+         return WizardCommon::Page_HttpCreds;
+     case DetermineAuthTypeJob::OAuth:
+         return WizardCommon::Page_OAuthCreds;
+-    case DetermineAuthTypeJob::LoginFlowV2:
+-        return WizardCommon::Page_Flow2AuthCreds;
+     case DetermineAuthTypeJob::Shibboleth:
+         return WizardCommon::Page_ShibbolethCreds;
+-    case DetermineAuthTypeJob::WebViewFlow:
+-        return WizardCommon::Page_WebView;
+     }
+     return WizardCommon::Page_HttpCreds;
+ }
+diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
+index e4dda0f..370302c 100644
+--- a/src/gui/wizard/owncloudwizard.cpp
++++ b/src/gui/wizard/owncloudwizard.cpp
+@@ -26,8 +26,6 @@
  #endif
  #include "wizard/owncloudadvancedsetuppage.h"
  #include "wizard/owncloudwizardresultpage.h"
 -#include "wizard/webviewpage.h"
+-#include "wizard/flow2authcredspage.h"
  
  #include "QProgressIndicator.h"
  
-@@ -51,7 +50,6 @@
+@@ -46,14 +44,12 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
+     , _setupPage(new OwncloudSetupPage(this))
+     , _httpCredsPage(new OwncloudHttpCredsPage(this))
+     , _browserCredsPage(new OwncloudOAuthCredsPage)
+-    , _flow2CredsPage(new Flow2AuthCredsPage)
+ #ifndef NO_SHIBBOLETH
+     , _shibbolethCredsPage(new OwncloudShibbolethCredsPage)
+ #endif
      , _advancedSetupPage(new OwncloudAdvancedSetupPage)
      , _resultPage(new OwncloudWizardResultPage)
      , _credentialsPage(nullptr)
@@ -106,7 +173,13 @@
      , _setupLog()
      , _registration(false)
  {
-@@ -64,7 +62,6 @@
+@@ -61,13 +57,11 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
+     setPage(WizardCommon::Page_ServerSetup, _setupPage);
+     setPage(WizardCommon::Page_HttpCreds, _httpCredsPage);
+     setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage);
+-    setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
+ #ifndef NO_SHIBBOLETH
+     setPage(WizardCommon::Page_ShibbolethCreds, _shibbolethCredsPage);
  #endif
      setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
      setPage(WizardCommon::Page_Result, _resultPage);
@@ -114,7 +187,11 @@
  
      connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
  
-@@ -79,7 +76,6 @@
+@@ -79,11 +73,9 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
+     connect(_setupPage, &OwncloudSetupPage::determineAuthType, this, &OwncloudWizard::determineAuthType);
+     connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+     connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+-    connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
  #ifndef NO_SHIBBOLETH
      connect(_shibbolethCredsPage, &OwncloudShibbolethCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
  #endif
@@ -122,7 +199,17 @@
      connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
          this, &OwncloudWizard::createLocalAndRemoteFolders);
      connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
-@@ -168,10 +164,6 @@
+@@ -168,20 +160,12 @@ void OwncloudWizard::successfulStep()
+         _browserCredsPage->setConnected();
+         break;
+ 
+-    case WizardCommon::Page_Flow2AuthCreds:
+-        _flow2CredsPage->setConnected();
+-        break;
+-
+ #ifndef NO_SHIBBOLETH
+     case WizardCommon::Page_ShibbolethCreds:
+         _shibbolethCredsPage->setConnected();
          break;
  #endif
  
@@ -133,69 +220,44 @@
      case WizardCommon::Page_AdvancedSetup:
          _advancedSetupPage->directoriesCreated();
          break;
-@@ -195,8 +187,6 @@
+@@ -205,10 +189,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob::AuthType type)
  #endif
          if (type == DetermineAuthTypeJob::OAuth) {
          _credentialsPage = _browserCredsPage;
+-    } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
+-        _credentialsPage = _flow2CredsPage;
 -    } else if (type == DetermineAuthTypeJob::WebViewFlow) {
 -        _credentialsPage = _webViewPage;
      } else { // try Basic auth even for "Unknown"
          _credentialsPage = _httpCredsPage;
      }
---- desktop-2.5.2/src/libsync/networkjobs.h	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/libsync/networkjobs.h	2019-04-22 05:21:11.950062594 +0000
-@@ -411,8 +411,7 @@
-     enum AuthType {
-         Basic, // also the catch-all fallback for backwards compatibility reasons
-         OAuth,
--        Shibboleth,
--        WebViewFlow
-+        Shibboleth
-     };
- 
-     explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);
---- desktop-2.5.2/src/libsync/networkjobs.cpp	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/libsync/networkjobs.cpp	2019-04-22 05:33:28.590067785 +0000
-@@ -922,7 +922,7 @@
- 
-     // WebViewFlow > OAuth > Shib > Basic
-     if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
--        result = WebViewFlow;
-+        result = Basic;
+@@ -233,7 +213,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
      }
  
-     qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
---- desktop-2.5.2/src/gui/wizard/owncloudsetuppage.cpp	2019-03-19 01:52:24.000000000 +0000
-+++ desktop-2.5.2/src/gui/wizard/owncloudsetuppage.cpp	2019-04-22 05:32:01.750067173 +0000
-@@ -143,7 +143,7 @@
- void OwncloudSetupPage::slotGotoProviderList()
- {
-     _ocWizard->setRegistration(true);
--    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
-+    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic);
-     _authTypeKnown = true;
-     _checking = false;
-     emit completeChanged();
-@@ -260,8 +260,6 @@
-         return WizardCommon::Page_OAuthCreds;
-     case DetermineAuthTypeJob::Shibboleth:
-         return WizardCommon::Page_ShibbolethCreds;
--    case DetermineAuthTypeJob::WebViewFlow:
--        return WizardCommon::Page_WebView;
-     }
-     return WizardCommon::Page_HttpCreds;
- }
---- desktop-2.5.2/src/gui/wizard/owncloudwizard.h	2019-03-18 21:52:24.000000000 -0400
-+++ desktop-2.5.2/src/gui/wizard/owncloudwizard.h	2019-04-22 02:07:03.600081984 -0400
-@@ -39,7 +39,6 @@
+     setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
+-    if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) {
++    if (id == WizardCommon::Page_AdvancedSetup) {
+         // For OAuth, disable the back button in the Page_AdvancedSetup because we don't want
+         // to re-open the browser.
+         button(QWizard::BackButton)->setEnabled(false);
+diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
+index c1d290d..1e32077 100644
+--- a/src/gui/wizard/owncloudwizard.h
++++ b/src/gui/wizard/owncloudwizard.h
+@@ -39,8 +39,6 @@ class OwncloudAdvancedSetupPage;
  class OwncloudWizardResultPage;
  class AbstractCredentials;
  class AbstractCredentialsWizardPage;
 -class WebViewPage;
+-class Flow2AuthCredsPage;
  
  /**
   * @brief The OwncloudWizard class
-@@ -106,7 +105,6 @@
+@@ -105,11 +103,9 @@ private:
+ #ifndef NO_SHIBBOLETH
+     OwncloudShibbolethCredsPage *_shibbolethCredsPage;
+ #endif
+-    Flow2AuthCredsPage *_flow2CredsPage;
      OwncloudAdvancedSetupPage *_advancedSetupPage;
      OwncloudWizardResultPage *_resultPage;
      AbstractCredentialsWizardPage *_credentialsPage;
@@ -203,3 +265,48 @@
  
      QStringList _setupLog;
  
+diff --git a/src/gui/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h
+index d1f7c08..c55ed04 100644
+--- a/src/gui/wizard/owncloudwizardcommon.h
++++ b/src/gui/wizard/owncloudwizardcommon.h
+@@ -38,8 +38,6 @@ namespace WizardCommon {
+         Page_HttpCreds,
+         Page_ShibbolethCreds,
+         Page_OAuthCreds,
+-        Page_Flow2AuthCreds,
+-        Page_WebView,
+         Page_AdvancedSetup,
+         Page_Result
+     };
+diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
+index c178895..eab4723 100644
+--- a/src/libsync/networkjobs.cpp
++++ b/src/libsync/networkjobs.cpp
+@@ -922,12 +922,12 @@ void DetermineAuthTypeJob::checkBothDone()
+ 
+     // WebViewFlow > OAuth > Shib > Basic
+     if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
+-        result = WebViewFlow;
++        result = Basic;
+     }
+ 
+     // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
+     if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
+-        result = LoginFlowV2;
++        result = Basic;
+     }
+ 
+     qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
+diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h
+index d0829b4..925ace0 100644
+--- a/src/libsync/networkjobs.h
++++ b/src/libsync/networkjobs.h
+@@ -412,8 +412,6 @@ public:
+         Basic, // also the catch-all fallback for backwards compatibility reasons
+         OAuth,
+         Shibboleth,
+-        WebViewFlow,
+-        LoginFlowV2
+     };
+ 
+     explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);