1 files changed, 53 insertions, 5 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
index 2a8c319..b2afea9 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
@@ -4,41 +4,89 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include "FileTransferOverview.h"
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
-#include <Swiften/Base/boost_bsignals.h>
 
+#include <Swiften/Base/Log.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/foreach.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
 namespace Swift {
 
 FileTransferOverview::FileTransferOverview(FileTransferManager* ftm) : fileTransferManager(ftm) {
 	fileTransferManager->onIncomingFileTransfer.connect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));
+	onNewFileTransferController.connect(boost::bind(&FileTransferOverview::handleNewFileTransferController, this, _1));
 }
 
 FileTransferOverview::~FileTransferOverview() {
-	
+	onNewFileTransferController.disconnect(boost::bind(&FileTransferOverview::handleNewFileTransferController, this, _1));
+	fileTransferManager->onIncomingFileTransfer.disconnect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));
+	foreach(FileTransferController* controller, fileTransfers) {
+		controller->onStateChanged.disconnect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
+	}
 }
 	
 void FileTransferOverview::sendFile(const JID& jid, const std::string& filename) {
 	if (boost::filesystem::exists(filename) && boost::filesystem::file_size(filename) > 0) {
 		FileTransferController* controller = new FileTransferController(jid, filename, fileTransferManager);
-		fileTransfers.push_back(controller);
-
 		onNewFileTransferController(controller);
 	}
 }
 
 void FileTransferOverview::handleIncomingFileTransfer(IncomingFileTransfer::ref transfer) {
 	FileTransferController* controller = new FileTransferController(transfer);
-	fileTransfers.push_back(controller);
 	onNewFileTransferController(controller);
 }
 
+void FileTransferOverview::handleNewFileTransferController(FileTransferController* controller) {
+	fileTransfers.push_back(controller);
+	controller->onStateChanged.connect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
+}
+
+void FileTransferOverview::handleFileTransferStateChanged() {
+	onFileTransferListChanged();
+}
+
 const std::vector<FileTransferController*>& FileTransferOverview::getFileTransfers() const {
 	return fileTransfers;
 }
 
+void FileTransferOverview::clearFinished() {
+	for (std::vector<FileTransferController*>::iterator it = fileTransfers.begin(); it != fileTransfers.end(); ) {
+		if((*it)->getState().type == FileTransfer::State::Finished
+			|| (*it)->getState().type == FileTransfer::State::Failed
+			|| (*it)->getState().type == FileTransfer::State::Canceled) {
+			FileTransferController* controller = *it;
+			it = fileTransfers.erase(it);
+			controller->onStateChanged.disconnect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
+			delete controller;
+		} else {
+			++it;
+		}
+	}
+	onFileTransferListChanged();
+}
+
+bool FileTransferOverview::isClearable() const {
+	bool isClearable = false;
+	foreach (FileTransferController* controller, fileTransfers) {
+		if(controller->getState().type == FileTransfer::State::Finished
+			|| controller->getState().type == FileTransfer::State::Failed
+			|| controller->getState().type == FileTransfer::State::Canceled) {
+			isClearable = true;
+			break;
+		}
+	}
+	return isClearable;
+}
+
 }