Merge lp:~xavi-garcia-mena/storage-provider-webdav/base-url-host-fix-to-trunk into lp:storage-provider-webdav

[Xavi Garcia]

Fix to use the host included in credentials when building the base_url.

Fix to use the host included in credentials when building the base_url.

This should fix the issue we have using any owncloud server located at any url different from localhost:8888/owncloud.

[James Henstridge (jamesh)]

Looks good.

review: Approve

[Charles Kerr (charlesk)]

:D

=== modified file 'src/OwncloudProvider.cpp'
--- src/OwncloudProvider.cpp	2016-11-18 04:34:55 +0000
+++ src/OwncloudProvider.cpp	2017-02-13 08:31:22 +0000
@@ -34,7 +34,9 @@
 QUrl OwncloudProvider::base_url(Context const& ctx) const
 {
     const auto& creds = boost::get<PasswordCredentials>(ctx.credentials);
-    return QUrl(QStringLiteral("http://localhost:8888/owncloud/remote.php/dav/files/%1/").arg(QString::fromStdString(creds.username)));
+    // get the host, removing any '/' at the end
+    auto host = QString::fromStdString(creds.host).remove(QRegExp("/*$"));
+    return QUrl(QStringLiteral("%1/remote.php/dav/files/%2/").arg(host).arg(QString::fromStdString(creds.username)));
 }
 
 QNetworkReply *OwncloudProvider::send_request(