From 7eadb11404a33919023d3bcb7587cf4210b32b64 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 12 Oct 2015 15:09:17 -0700
Subject: [PATCH] Remove optional upload caching

---
 libraries/networking/src/AssetUpload.cpp | 11 +++++------
 libraries/networking/src/AssetUpload.h   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libraries/networking/src/AssetUpload.cpp b/libraries/networking/src/AssetUpload.cpp
index fd9ae7ab43..6f4fcbf1f2 100644
--- a/libraries/networking/src/AssetUpload.cpp
+++ b/libraries/networking/src/AssetUpload.cpp
@@ -23,9 +23,9 @@ AssetUpload::AssetUpload(QObject* object, const QString& filename) :
     
 }
 
-void AssetUpload::start(bool cacheOnSuccess) {
+void AssetUpload::start() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "start", Q_ARG(bool, cacheOnSuccess));
+        QMetaObject::invokeMethod(this, "start");
         return;
     }
     
@@ -44,9 +44,8 @@ void AssetUpload::start(bool cacheOnSuccess) {
         
         qCDebug(asset_client) << "Attempting to upload" << _filename << "to asset-server.";
         
-        assetClient->uploadAsset(_data, _extension,
-                                 [this, cacheOnSuccess](bool responseReceived, AssetServerError error,
-                                                        const QString& hash){
+        assetClient->uploadAsset(_data, _extension, [this](bool responseReceived, AssetServerError error,
+                                                           const QString& hash){
             if (!responseReceived) {
                 _error = NetworkError;
             } else {
@@ -66,7 +65,7 @@ void AssetUpload::start(bool cacheOnSuccess) {
                 }
             }
             
-            if (cacheOnSuccess && _error == NoError && hash == hashData(_data).toHex()) {
+            if (_error == NoError && hash == hashData(_data).toHex()) {
                 saveToCache(getUrl(hash, _extension), _data);
             }
             
diff --git a/libraries/networking/src/AssetUpload.h b/libraries/networking/src/AssetUpload.h
index fbba545209..4047a44923 100644
--- a/libraries/networking/src/AssetUpload.h
+++ b/libraries/networking/src/AssetUpload.h
@@ -37,7 +37,7 @@ public:
     
     AssetUpload(QObject* parent, const QString& filename);
     
-    Q_INVOKABLE void start(bool cacheOnSuccess = true);
+    Q_INVOKABLE void start();
     
     const QString& getFilename() const { return _filename; }
     const QString& getExtension() const  { return _extension; }