1 files changed, 25 insertions, 9 deletions
diff --git a/Swiften/FileTransfer/ByteArrayReadBytestream.h b/Swiften/FileTransfer/ByteArrayReadBytestream.h
index d459658..9311099 100644
--- a/Swiften/FileTransfer/ByteArrayReadBytestream.h
+++ b/Swiften/FileTransfer/ByteArrayReadBytestream.h
@@ -6,31 +6,47 @@
 
 #pragma once
 
-#include "Swiften/FileTransfer/ReadBytestream.h"
-#include "Swiften/Base/ByteArray.h"
+#include <vector>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <Swiften/Base/Algorithm.h>
+#include <Swiften/FileTransfer/ReadBytestream.h>
+#include <Swiften/Base/ByteArray.h>
 
 namespace Swift {
 	class ByteArrayReadBytestream : public ReadBytestream {
 		public:
-			ByteArrayReadBytestream(const ByteArray& data) : data(data), position(0) {
+			ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0), dataComplete(true) {
 			}
 
-			virtual ByteArray read(size_t size) {
+			virtual boost::shared_ptr<ByteArray> read(size_t size) {
 				size_t readSize = size;
-				if (position + readSize > data.getSize()) {
-					readSize = data.getSize() - position;
+				if (position + readSize > data.size()) {
+					readSize = data.size() - position;
 				}
-				ByteArray result(data.getData() + position, readSize);
+				boost::shared_ptr<ByteArray> result = boost::make_shared<ByteArray>(data.begin() + position, data.begin() + position + readSize);
+
+				onRead(*result);
 				position += readSize;
 				return result;
 			}
 
 			virtual bool isFinished() const {
-				return position >= data.getSize();
+				return position >= data.size() && dataComplete;
+			}
+
+			virtual void setDataComplete(bool b) {
+				dataComplete = b;
+			}
+
+			void addData(const std::vector<unsigned char>& moreData) {
+				append(data, moreData);
+				onDataAvailable();
 			}
 
 		private:
-			ByteArray data;
+			std::vector<unsigned char> data;
 			size_t position;
+			bool dataComplete;
 	};
 }