Merge lp:~mandel/ubuntu-download-manager/change-wifi-default into lp:ubuntu-download-manager

[Manuel de la Peña]

Set the defaults to allow modile data usage so that we ensure that client applications dot no have to set it per download.

Set the defaults to allow modile data usage so that we ensure that client applications dot no have to set it per download. This change is performed on the udm server side and therefore no rebuild or change is needed in the client apps.

[lp:~mandel/ubuntu-download-manager/change-wifi-default]

338. By Manuel de la Peña on 2015-02-02

Update the default value of the qml binding.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/751/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good, tested with browser and image downloads are no longer queued.

review: Approve

=== modified file 'src/common/priv/ubuntu/transfers/transfer.h'
--- src/common/priv/ubuntu/transfers/transfer.h	2014-11-17 20:34:24 +0000
+++ src/common/priv/ubuntu/transfers/transfer.h	2015-02-02 11:23:00 +0000
@@ -97,16 +97,16 @@
  private:
     bool _isValid = true;
     bool _addToQueue = true;
-    QString _lastError = "";
-    QString _id;
-    QString _appId;
-    qulonglong _throttle;
-    bool _allowMobileData;
-    Transfer::State _state;
-    QString _dbusPath;
-    bool _isConfined;
-    QString _rootPath;
-    System::NetworkSession* _networkSession;
+    QString _lastError = QString::null;
+    QString _id = QString::null;
+    QString _appId = QString::null;
+    qulonglong _throttle = 0;
+    bool _allowMobileData = true;
+    Transfer::State _state = State::IDLE;
+    QString _dbusPath = QString::null;
+    bool _isConfined = true;
+    QString _rootPath = QString::null;
+    System::NetworkSession* _networkSession = nullptr;
 };
 
 }  // Transfers

=== modified file 'src/downloads/qml/single_download.h'
--- src/downloads/qml/single_download.h	2014-09-23 14:19:37 +0000
+++ src/downloads/qml/single_download.h	2015-02-02 11:23:00 +0000
@@ -158,13 +158,13 @@
     }
 
 private:
-    bool m_autoStart;
-    bool m_completed;
-    bool m_downloading;
+    bool m_autoStart = false;
+    bool m_completed = false;
+    bool m_downloading = false;
     bool m_dirty = false;
-    bool m_downloadInProgress;
+    bool m_downloadInProgress = false;
     int m_progress;
-    bool m_mobile = false;
+    bool m_mobile = true;
     qulonglong m_throttle = 0;
     QVariantMap m_headers;
     Metadata* m_metadata = nullptr;

=== modified file 'tests/downloads/daemon/test_download.cpp'
--- tests/downloads/daemon/test_download.cpp	2015-01-22 22:08:41 +0000
+++ tests/downloads/daemon/test_download.cpp	2015-02-02 11:23:00 +0000
@@ -123,6 +123,7 @@
     QCOMPARE(download->state(), Download::IDLE);
     QCOMPARE(download->progress(), 0ULL);
     QCOMPARE(download->totalSize(), 0ULL);
+    QVERIFY(download->isGSMDataAllowed());
     verifyMocks();
 }
 
@@ -173,6 +174,7 @@
     QCOMPARE(download->state(), Download::IDLE);
     QCOMPARE(download->progress(), 0ULL);
     QCOMPARE(download->totalSize(), 0ULL);
+    QVERIFY(download->isGSMDataAllowed());
     verifyMocks();
 }
 

=== modified file 'tests/downloads/daemon/test_download.h'
--- tests/downloads/daemon/test_download.h	2015-01-22 22:08:41 +0000
+++ tests/downloads/daemon/test_download.h	2015-02-02 11:23:00 +0000
@@ -196,20 +196,20 @@
     void testDataUriPostProcessing();
 
  private:
-    QString _id;
-    QString _appId;
-    bool _isConfined;
-    QString _rootPath;
+    QString _id = QString::null;
+    QString _appId = QString::null;
+    bool _isConfined = false;
+    QString _rootPath = QString::null;
     QVariantMap _metadata;
     QMap<QString, QString> _headers;
-    QString _path;
+    QString _path = QString::null;
     QUrl _url;
-    QString _algo;
-    MockNetworkSession* _networkSession;
-    MockRequestFactory* _reqFactory;
-    MockProcessFactory* _processFactory;
-    MockFileManager* _fileManager;
-    MockCryptographicHashFactory* _cryptoFactory;
+    QString _algo = QString::null;
+    MockNetworkSession* _networkSession = nullptr;
+    MockRequestFactory* _reqFactory = nullptr;
+    MockProcessFactory* _processFactory = nullptr;
+    MockFileManager* _fileManager = nullptr;
+    MockCryptographicHashFactory* _cryptoFactory = nullptr;
 };
 
 Q_DECLARE_METATYPE(QNetworkConfiguration::BearerType)