Merge lp:~mandel/ubuntu-download-manager/add-mng-class into lp:ubuntu-download-manager

[Manuel de la Peña]

Add uploads manager implementation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:317
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/390/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/279/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/390/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

318. By Manuel de la Peña on 2014-03-31

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:317
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/395/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/284
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/284/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/395/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/407/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/296
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/296/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/407/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

319. By Manuel de la Peña on 2014-04-01

Merged add-factory into add-mng-class.

320. By Manuel de la Peña on 2014-04-01

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/409/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/298/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/409/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:320
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/422/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/311/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/422/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

321. By Manuel de la Peña on 2014-04-01

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:321
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/434/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/323/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/323/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/434/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

322. By Manuel de la Peña on 2014-04-02

Merged add-factory into add-mng-class.

323. By Manuel de la Peña on 2014-04-02

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/446/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/335/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/446/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/458/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/347/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/458/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

324. By Manuel de la Peña on 2014-04-02

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/466/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/355/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/466/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

325. By Manuel de la Peña on 2014-04-03

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/478/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/367
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/367/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/478/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

326. By Manuel de la Peña on 2014-04-03

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/503/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/393
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/392/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/503/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

327. By Manuel de la Peña on 2014-04-03

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/398
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/397/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/508/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

328. By Manuel de la Peña on 2014-04-07

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/521/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/411
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/410/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/521/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

329. By Manuel de la Peña on 2014-04-07

Merged add-factory into add-mng-class.

330. By Manuel de la Peña on 2014-04-07

Merged add-factory into add-mng-class.

331. By Manuel de la Peña on 2014-04-07

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/542/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/432
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/431/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/542/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

332. By Manuel de la Peña on 2014-04-08

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/554/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/444
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/443/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/554/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

333. By Manuel de la Peña on 2014-04-08

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/568/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/458
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/457/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/568/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

334. By Manuel de la Peña on 2014-04-09

Merged add-factory into add-mng-class.

335. By Manuel de la Peña on 2014-04-09

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/472

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/583/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/590/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/480/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/479

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/590/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

336. By Manuel de la Peña on 2014-04-09

Merged add-factory into add-mng-class.

337. By Manuel de la Peña on 2014-04-09

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/600/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/489

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/600/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/add-mng-class]

338. By Manuel de la Peña on 2014-04-15

Merged add-factory into add-mng-class.

339. By Manuel de la Peña on 2014-04-15

Merged add-factory into add-mng-class.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/626/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/515

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/626/rebuild

review: Approve (continuous-integration)

=== modified file 'ubuntu-upload-manager-priv/ubuntu/uploads/daemon.cpp'
--- ubuntu-upload-manager-priv/ubuntu/uploads/daemon.cpp	2014-04-15 15:31:31 +0000
+++ ubuntu-upload-manager-priv/ubuntu/uploads/daemon.cpp	2014-04-15 15:31:32 +0000
@@ -36,10 +36,10 @@
 }
 
 UploadDaemon::UploadDaemon(ManagerFactory* managerFactory,
-                               System::Application* app,
-                               System::DBusConnection* conn,
-                               System::Timer* timer,
-                               QObject *parent)
+                           System::Application* app,
+                           System::DBusConnection* conn,
+                           System::Timer* timer,
+                           QObject *parent)
     : BaseDaemon(managerFactory,
                  new UploadAdaptorFactory(),
                  app, conn, timer, parent) {

=== modified file 'ubuntu-upload-manager-priv/ubuntu/uploads/daemon.h'
--- ubuntu-upload-manager-priv/ubuntu/uploads/daemon.h	2014-04-15 15:31:31 +0000
+++ ubuntu-upload-manager-priv/ubuntu/uploads/daemon.h	2014-04-15 15:31:32 +0000
@@ -35,10 +35,10 @@
  public:
     UploadDaemon(QObject *parent = 0);
     UploadDaemon(ManagerFactory* managerFactory,
-                   System::Application* app,
-                   System::DBusConnection* conn,
-                   System::Timer* timer,
-                   QObject *parent = 0);
+                 System::Application* app,
+                 System::DBusConnection* conn,
+                 System::Timer* timer,
+                 QObject *parent = 0);
 
  public slots:
     virtual void start();

=== modified file 'ubuntu-upload-manager-priv/ubuntu/uploads/file_upload.cpp'
--- ubuntu-upload-manager-priv/ubuntu/uploads/file_upload.cpp	2014-04-15 15:31:31 +0000
+++ ubuntu-upload-manager-priv/ubuntu/uploads/file_upload.cpp	2014-04-15 15:31:32 +0000
@@ -56,10 +56,18 @@
     // we must make sure that the path is absolute
     QFileInfo info(filePath);
     if (!info.isAbsolute()) {
+        UP_LOG(INFO) << "Path is not absolute: " << filePath;
         setIsValid(false);
         setLastError(QString("Path is not absolute: '%1'").arg(filePath));
     }
-    _currentData = FileManager::instance()->copyToTempFile(filePath);
+
+    if (!info.exists()) {
+        UP_LOG(INFO) << "Path does not exist: " << filePath;
+        setIsValid(false);
+        setLastError(QString("Path does not exist: '%1'").arg(filePath));
+    } else {
+        _currentData = FileManager::instance()->createFile(filePath);
+    }
     _requestFactory = RequestFactory::instance();
 }
 
@@ -181,7 +189,7 @@
     request.setHeader(QNetworkRequest::ContentTypeHeader,
         CONTENT_TYPE_HEADER);
     request.setHeader(QNetworkRequest::ContentLengthHeader,
-        QString::number(_currentData->size()));
+        _currentData->size());
 
     return request;
 }

=== modified file 'ubuntu-upload-manager-priv/ubuntu/uploads/manager.cpp'
--- ubuntu-upload-manager-priv/ubuntu/uploads/manager.cpp	2014-04-15 15:31:31 +0000
+++ ubuntu-upload-manager-priv/ubuntu/uploads/manager.cpp	2014-04-15 15:31:32 +0000
@@ -16,6 +16,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <functional>
+#include <QRegExp>
+#include <ubuntu/transfers/system/apparmor.h>
+#include <ubuntu/transfers/system/logger.h>
+#include <ubuntu/transfers/system/request_factory.h>
+#include <ubuntu/upload_manager/metatypes.h>
 #include "manager.h"
 
 namespace Ubuntu {
@@ -33,40 +39,89 @@
                              DBusConnection* connection,
                              bool stoppable,
                              QObject *parent)
-    : BaseManager(app, stoppable, parent) {
-    Q_UNUSED(connection);
+    : BaseManager(app, stoppable, parent),
+      _throttle(0) {
+    _conn = connection;
+    RequestFactory::setStoppable(_stoppable);
+    _factory = new Factory(this);
+    _queue = new Queue(this);
+    init();
 }
 
-/*
 UploadManager::UploadManager(Application* app,
                              DBusConnection* connection,
-                             Factory* downloadFactory,
+                             Factory* uploadFactory,
                              Queue* queue,
                              bool stoppable,
-                             QObject *parent) {
-}
-*/
+                             QObject *parent)
+    : BaseManager(app, stoppable, parent),
+      _throttle(0),
+      _factory(uploadFactory),
+      _queue(queue) {
+    _conn = connection;
+    init();
+}
+
+void
+UploadManager::init() {
+    // register the required types
+    qDBusRegisterMetaType<StringMap>();
+    qDBusRegisterMetaType<UploadStruct>();
+    qDBusRegisterMetaType<AuthErrorStruct>();
+    qDBusRegisterMetaType<HttpErrorStruct>();
+    qDBusRegisterMetaType<NetworkErrorStruct>();
+    qDBusRegisterMetaType<ProcessErrorStruct>();
+
+    connect(_queue, &Queue::transferRemoved,
+        this, &UploadManager::onUploadsChanged);
+    connect(_queue, &Queue::transferAdded,
+        this, &UploadManager::onUploadsChanged);
+}
 
 UploadManager::~UploadManager() {
+    delete _queue;
+    delete _factory;
 }
 
 QList<QSslCertificate>
 UploadManager::acceptedCertificates() {
-    // TODO: Most be implemented
-    QList<QSslCertificate> certs;
-    return certs;
+    return _factory->acceptedCertificates();
 }
 
 void
 UploadManager::setAcceptedCertificates(const QList<QSslCertificate>& certs) {
-    // TODO: Most be implemented
-    Q_UNUSED(certs);
+    LOG(INFO) << __PRETTY_FUNCTION__;
+    _factory->setAcceptedCertificates(certs);
 }
 
 void
 UploadManager::allowMobileUpload(bool allowed) {
-    // TODO: Most be implemented
-    Q_UNUSED(allowed);
+    _allowMobileData = allowed;
+    QHash<QString, Transfer*> uploads = _queue->transfers();
+    foreach(const QString& path, uploads.keys()) {
+        uploads[path]->allowGSMData(allowed);
+    }
+}
+
+QDBusObjectPath
+UploadManager::createUpload(UploadCreationFunc createUploadFunc) {
+    QString owner = "";
+
+    auto wasCalledFromDBus = calledFromDBus();
+    if (wasCalledFromDBus) {
+        owner = connection().interface()->serviceOwner(
+            message().service());
+        LOG(INFO) << "Owner is: " << owner;
+    }
+
+    auto upload = createUploadFunc(owner);
+
+    if (wasCalledFromDBus && !upload->isValid()) {
+        sendErrorReply(QDBusError::InvalidArgs, upload->lastError());
+        // the result will be ignored thanks to the sendErrorReply
+        return QDBusObjectPath();
+    }
+    return registerUpload(upload);
 }
 
 QDBusObjectPath
@@ -76,27 +131,45 @@
                                int port,
                                const QString& username,
                                const QString& password) {
-    // TODO: Most be implemented
-    Q_UNUSED(url);
-    Q_UNUSED(file);
-    Q_UNUSED(hostname);
-    Q_UNUSED(port);
-    Q_UNUSED(username);
-    Q_UNUSED(password);
-    return QDBusObjectPath();
-}
-
-QDBusObjectPath
-UploadManager::createUpload(UploadStruct upload) {
-    // TODO: Most be implemented
-    Q_UNUSED(upload);
-    return QDBusObjectPath();
+    LOG(INFO) << "Create MMS upload == {url:" << url << " filePath: "
+        << file << " hostname:" << hostname << " port:"
+        << port << " username:" << username << " pwd: " << password << "}";
+    UploadCreationFunc createUploadFunc =
+        [this, url, file, hostname, port, username, password](QString owner) {
+        auto upload = _factory->createMmsUpload(owner, url, file, hostname,
+            port, username, password);
+        return upload;
+    };
+    return createUpload(createUploadFunc);
+}
+
+QDBusObjectPath
+UploadManager::createUpload(const QString& url,
+                            const QString& filePath,
+                            const QVariantMap& metadata,
+                            StringMap headers) {
+
+    LOG(INFO) << "Create upload == {url:" << url << " filePath: "
+        << filePath << " metadata: " << metadata << " headers: "
+        << headers << "}";
+    UploadCreationFunc createUploadFunc =
+        [this, url, filePath, metadata, headers](QString owner) {
+        return _factory->createUpload(owner, url, filePath,
+            metadata, headers);
+    };
+    return createUpload(createUploadFunc);
+}
+
+QDBusObjectPath
+UploadManager::createUpload(UploadStruct uploadStruct) {
+    return createUpload(uploadStruct.getUrl(),
+        uploadStruct.getFilePath(), uploadStruct.getMetadata(),
+        uploadStruct.getHeaders());
 }
 
 qulonglong
 UploadManager::defaultThrottle() {
-    // TODO: Most be implemented
-    return 0;
+    return _throttle;
 }
 
 QList<QDBusObjectPath>
@@ -118,14 +191,37 @@
 
 bool
 UploadManager::isMobileUploadAllowed() {
-    // TODO: Most be implemented
-    return false;
+    return _allowMobileData;
 }
 
 void
 UploadManager::setDefaultThrottle(qulonglong speed) {
-    // TODO: Most be implemented
-    Q_UNUSED(speed);
+    _throttle = speed;
+    QHash<QString, Transfer*> uploads = _queue->transfers();
+    foreach(const QString& path, uploads.keys()) {
+        uploads[path]->setThrottle(speed);
+    }
+}
+
+void
+UploadManager::onUploadsChanged(QString path) {
+    LOG(INFO) << __PRETTY_FUNCTION__ << path;
+    emit sizeChanged(_queue->size());
+}
+
+QDBusObjectPath
+UploadManager::registerUpload(FileUpload* upload) {
+    LOG(INFO) << "Registering upload to path " << upload->path();
+    upload->setThrottle(_throttle);
+    upload->allowMobileUpload(_allowMobileData);
+    _queue->add(upload);
+    _conn->registerObject(upload->path(), upload);
+    QDBusObjectPath objectPath = QDBusObjectPath(upload->path());
+
+    // emit that the upload was created. Useful in case other
+    // processes are interested in them
+    emit uploadCreated(objectPath);
+    return objectPath;
 }
 
 }  // Daemon

=== modified file 'ubuntu-upload-manager-priv/ubuntu/uploads/manager.h'
--- ubuntu-upload-manager-priv/ubuntu/uploads/manager.h	2014-04-15 15:31:31 +0000
+++ ubuntu-upload-manager-priv/ubuntu/uploads/manager.h	2014-04-15 15:31:32 +0000
@@ -28,6 +28,7 @@
 #include <ubuntu/transfers/system/dbus_connection.h>
 #include <ubuntu/transfers/queue.h>
 #include <ubuntu/transfers/base_manager.h>
+#include "factory.h"
 
 namespace Ubuntu {
 
@@ -45,13 +46,13 @@
                   DBusConnection* connection,
                   bool stoppable = false,
                   QObject *parent = 0);
-/*    UploadManager(Application* app,
+    UploadManager(Application* app,
                   DBusConnection* connection,
                   Factory* downloadFactory,
                   Queue* queue,
                   bool stoppable = false,
                   QObject *parent = 0);
-*/
+
     virtual ~UploadManager();
 
     virtual QList<QSslCertificate> acceptedCertificates();
@@ -66,6 +67,10 @@
                                     int port,
                                     const QString& username,
                                     const QString& password);
+    QDBusObjectPath createUpload(const QString& url,
+                                 const QString& filePath,
+                                 const QVariantMap& metadata,
+                                 StringMap headers);
     QDBusObjectPath createUpload(UploadStruct upload);
     qulonglong defaultThrottle();
     QList<QDBusObjectPath> getAllUploads();
@@ -75,6 +80,28 @@
     bool isMobileUploadAllowed();
     void setDefaultThrottle(qulonglong speed);
 
+ signals:
+    void uploadCreated(const QDBusObjectPath& path);
+    void sizeChanged(int size);
+
+ private:
+    typedef std::function<FileUpload*(QString)> UploadCreationFunc;
+
+    QDBusObjectPath createUpload(UploadCreationFunc createUploadFunc);
+    void onUploadsChanged(QString);
+    QDBusObjectPath registerUpload(FileUpload* upload);
+
+    void init();
+
+
+ private:
+    Application* _app = nullptr;
+    qulonglong _throttle;
+    Factory* _factory = nullptr;
+    Queue* _queue = nullptr;
+    DBusConnection* _conn = nullptr;
+    bool _stoppable = false;
+    bool _allowMobileData = true;
 };
 
 }  // Daemon