4 files changed, 80 insertions, 14 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index f7ce8e6..c21c364 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -119,11 +119,11 @@ void FileTransferController::cancel() {
        }
 }
 void FileTransferController::handleFileTransferStateChange(FileTransfer::State state) {
        currentState = state;
-        onStateChage();
+        onStateChanged();
        switch(state.type) {
                case FileTransfer::State::Initial:
                        assert(false);
                        return;
                case FileTransfer::State::Negotiating:
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h
index 3d6f7d5..490773d 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.h
+++ b/Swift/Controllers/FileTransfer/FileTransferController.h
@@ -2,22 +2,29 @@
 * Copyright (c) 2011 Tobias Markmann
 * Licensed under the simplified BSD license.
 * See Documentation/Licenses/BSD-simplified.txt for more information.
 */
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 #pragma once
 #include <string>
-#include <boost/shared_ptr.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/shared_ptr.hpp>
-#include <Swiften/JID/JID.h>
-#include <Swiften/FileTransfer/FileTransfer.h>
-#include <Swiften/FileTransfer/IncomingFileTransfer.h>
 #include <Swiften/FileTransfer/FileReadBytestream.h>
+#include <Swiften/FileTransfer/FileTransfer.h>
 #include <Swiften/FileTransfer/FileWriteBytestream.h>
+#include <Swiften/FileTransfer/IncomingFileTransfer.h>
+#include <Swiften/JID/JID.h>
 #include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h>
 namespace Swift {
 class FileTransferManager;
@@ -47,18 +54,18 @@ public:
        bool isIncoming() const;
        FileTransfer::State getState() const;
        int getProgress() const;
        boost::uintmax_t getSize() const;
-        boost::signal<void ()> onStateChage;
+        boost::signal<void ()> onStateChanged;
        boost::signal<void ()> onProgressChange;
 private:
        void handleFileTransferStateChange(FileTransfer::State);
        void handleProgressPercentageChange(int percentage);
-private:        
+private:
        bool sending;
        JID otherParty;
        std::string filename;
        FileTransfer::ref transfer;
        boost::shared_ptr<FileReadBytestream> fileReadStream;
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
@@ -2,43 +2,91 @@
 * Copyright (c) 2011 Tobias Markmann
 * Licensed under the simplified BSD license.
 * 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;
+}
 }
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.h b/Swift/Controllers/FileTransfer/FileTransferOverview.h
index 716666a..e3cbf81 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.h
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.h
@@ -2,18 +2,24 @@
 * Copyright (c) 2011 Tobias Markmann
 * Licensed under the simplified BSD license.
 * See Documentation/Licenses/BSD-simplified.txt for more information.
 */
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 #pragma once
 #include <vector>
-#include "Swift/Controllers/FileTransfer/FileTransferController.h"
 #include <Swiften/Base/boost_bsignals.h>
+#include <Swift/Controllers/FileTransfer/FileTransferController.h>
 namespace Swift {
 class ChatsManager;
 class FileTransferManager;
@@ -22,15 +28,20 @@ public:
        FileTransferOverview(FileTransferManager*);
        ~FileTransferOverview();
        
        void sendFile(const JID&, const std::string&);
        const std::vector<FileTransferController*>& getFileTransfers() const;
+        void clearFinished();
+        bool isClearable() const;
        boost::signal<void (FileTransferController*)> onNewFileTransferController;
+        boost::signal<void ()> onFileTransferListChanged;
 private:
        void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer);
+        void handleNewFileTransferController(FileTransferController* controller);
+        void handleFileTransferStateChanged();
 private:
        std::vector<FileTransferController*> fileTransfers;
        FileTransferManager *fileTransferManager;
 };

diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp index f7ce8e6..c21c364 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.cpp +++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -119,11 +119,11 @@ void FileTransferController::cancel() {
119	}	119	}
120	}	120	}
121		121
122	void FileTransferController::handleFileTransferStateChange(FileTransfer::State state) {	122	void FileTransferController::handleFileTransferStateChange(FileTransfer::State state) {
123	currentState = state;	123	currentState = state;
124	onStateChage();	124	onStateChanged();
125	switch(state.type) {	125	switch(state.type) {
126	case FileTransfer::State::Initial:	126	case FileTransfer::State::Initial:
127	assert(false);	127	assert(false);
128	return;	128	return;
129	case FileTransfer::State::Negotiating:	129	case FileTransfer::State::Negotiating:


diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h index 3d6f7d5..490773d 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.h +++ b/Swift/Controllers/FileTransfer/FileTransferController.h
@@ -2,22 +2,29 @@
2	* Copyright (c) 2011 Tobias Markmann	2	* Copyright (c) 2011 Tobias Markmann
3	* Licensed under the simplified BSD license.	3	* Licensed under the simplified BSD license.
4	* See Documentation/Licenses/BSD-simplified.txt for more information.	4	* See Documentation/Licenses/BSD-simplified.txt for more information.
5	*/	5	*/
6		6
		7	/*
		8	* Copyright (c) 2015 Isode Limited.
		9	* All rights reserved.
		10	* See the COPYING file for more information.
		11	*/
		12
7	#pragma once	13	#pragma once
8		14
9	#include <string>	15	#include <string>
10		16
11	#include <boost/shared_ptr.hpp>
12	#include <boost/cstdint.hpp>	17	#include <boost/cstdint.hpp>
		18	#include <boost/shared_ptr.hpp>
13		19
14	#include <Swiften/JID/JID.h>
15	#include <Swiften/FileTransfer/FileTransfer.h>
16	#include <Swiften/FileTransfer/IncomingFileTransfer.h>
17	#include <Swiften/FileTransfer/FileReadBytestream.h>	20	#include <Swiften/FileTransfer/FileReadBytestream.h>
		21	#include <Swiften/FileTransfer/FileTransfer.h>
18	#include <Swiften/FileTransfer/FileWriteBytestream.h>	22	#include <Swiften/FileTransfer/FileWriteBytestream.h>
		23	#include <Swiften/FileTransfer/IncomingFileTransfer.h>
		24	#include <Swiften/JID/JID.h>
		25
19	#include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h>	26	#include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h>
20		27
21	namespace Swift {	28	namespace Swift {
22		29
23	class FileTransferManager;	30	class FileTransferManager;
@@ -47,18 +54,18 @@ public:
47	bool isIncoming() const;	54	bool isIncoming() const;
48	FileTransfer::State getState() const;	55	FileTransfer::State getState() const;
49	int getProgress() const;	56	int getProgress() const;
50	boost::uintmax_t getSize() const;	57	boost::uintmax_t getSize() const;
51		58
52	boost::signal<void ()> onStateChage;	59	boost::signal<void ()> onStateChanged;
53	boost::signal<void ()> onProgressChange;	60	boost::signal<void ()> onProgressChange;
54		61
55	private:	62	private:
56	void handleFileTransferStateChange(FileTransfer::State);	63	void handleFileTransferStateChange(FileTransfer::State);
57	void handleProgressPercentageChange(int percentage);	64	void handleProgressPercentageChange(int percentage);
58		65
59	private:	66	private:
60	bool sending;	67	bool sending;
61	JID otherParty;	68	JID otherParty;
62	std::string filename;	69	std::string filename;
63	FileTransfer::ref transfer;	70	FileTransfer::ref transfer;
64	boost::shared_ptr<FileReadBytestream> fileReadStream;	71	boost::shared_ptr<FileReadBytestream> fileReadStream;


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
@@ -2,43 +2,91 @@
2	* Copyright (c) 2011 Tobias Markmann	2	* Copyright (c) 2011 Tobias Markmann
3	* Licensed under the simplified BSD license.	3	* Licensed under the simplified BSD license.
4	* See Documentation/Licenses/BSD-simplified.txt for more information.	4	* See Documentation/Licenses/BSD-simplified.txt for more information.
5	*/	5	*/
6		6
		7	/*
		8	* Copyright (c) 2015 Isode Limited.
		9	* All rights reserved.
		10	* See the COPYING file for more information.
		11	*/
		12
7	#include "FileTransferOverview.h"	13	#include "FileTransferOverview.h"
8		14
9	#include <boost/bind.hpp>	15	#include <boost/bind.hpp>
10	#include <boost/filesystem.hpp>	16	#include <boost/filesystem.hpp>
11	#include <Swiften/Base/boost_bsignals.h>
12		17
		18	#include <Swiften/Base/Log.h>
		19	#include <Swiften/Base/boost_bsignals.h>
		20	#include <Swiften/Base/foreach.h>
13	#include <Swiften/FileTransfer/FileTransferManager.h>	21	#include <Swiften/FileTransfer/FileTransferManager.h>
14		22
15	namespace Swift {	23	namespace Swift {
16		24
17	FileTransferOverview::FileTransferOverview(FileTransferManager* ftm) : fileTransferManager(ftm) {	25	FileTransferOverview::FileTransferOverview(FileTransferManager* ftm) : fileTransferManager(ftm) {
18	fileTransferManager->onIncomingFileTransfer.connect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));	26	fileTransferManager->onIncomingFileTransfer.connect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));
		27	onNewFileTransferController.connect(boost::bind(&FileTransferOverview::handleNewFileTransferController, this, _1));
19	}	28	}
20		29
21	FileTransferOverview::~FileTransferOverview() {	30	FileTransferOverview::~FileTransferOverview() {
22		31	onNewFileTransferController.disconnect(boost::bind(&FileTransferOverview::handleNewFileTransferController, this, _1));
		32	fileTransferManager->onIncomingFileTransfer.disconnect(boost::bind(&FileTransferOverview::handleIncomingFileTransfer, this, _1));
		33	foreach(FileTransferController* controller, fileTransfers) {
		34	controller->onStateChanged.disconnect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
		35	}
23	}	36	}
24		37
25	void FileTransferOverview::sendFile(const JID& jid, const std::string& filename) {	38	void FileTransferOverview::sendFile(const JID& jid, const std::string& filename) {
26	if (boost::filesystem::exists(filename) && boost::filesystem::file_size(filename) > 0) {	39	if (boost::filesystem::exists(filename) && boost::filesystem::file_size(filename) > 0) {
27	FileTransferController* controller = new FileTransferController(jid, filename, fileTransferManager);	40	FileTransferController* controller = new FileTransferController(jid, filename, fileTransferManager);
28	fileTransfers.push_back(controller);
29
30	onNewFileTransferController(controller);	41	onNewFileTransferController(controller);
31	}	42	}
32	}	43	}
33		44
34	void FileTransferOverview::handleIncomingFileTransfer(IncomingFileTransfer::ref transfer) {	45	void FileTransferOverview::handleIncomingFileTransfer(IncomingFileTransfer::ref transfer) {
35	FileTransferController* controller = new FileTransferController(transfer);	46	FileTransferController* controller = new FileTransferController(transfer);
36	fileTransfers.push_back(controller);
37	onNewFileTransferController(controller);	47	onNewFileTransferController(controller);
38	}	48	}
39		49
		50	void FileTransferOverview::handleNewFileTransferController(FileTransferController* controller) {
		51	fileTransfers.push_back(controller);
		52	controller->onStateChanged.connect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
		53	}
		54
		55	void FileTransferOverview::handleFileTransferStateChanged() {
		56	onFileTransferListChanged();
		57	}
		58
40	const std::vector<FileTransferController*>& FileTransferOverview::getFileTransfers() const {	59	const std::vector<FileTransferController*>& FileTransferOverview::getFileTransfers() const {
41	return fileTransfers;	60	return fileTransfers;
42	}	61	}
43		62
		63	void FileTransferOverview::clearFinished() {
		64	for (std::vector<FileTransferController*>::iterator it = fileTransfers.begin(); it != fileTransfers.end(); ) {
		65	if((*it)->getState().type == FileTransfer::State::Finished
		66	\|\| (*it)->getState().type == FileTransfer::State::Failed
		67	\|\| (*it)->getState().type == FileTransfer::State::Canceled) {
		68	FileTransferController* controller = *it;
		69	it = fileTransfers.erase(it);
		70	controller->onStateChanged.disconnect(boost::bind(&FileTransferOverview::handleFileTransferStateChanged, this));
		71	delete controller;
		72	} else {
		73	++it;
		74	}
		75	}
		76	onFileTransferListChanged();
		77	}
		78
		79	bool FileTransferOverview::isClearable() const {
		80	bool isClearable = false;
		81	foreach (FileTransferController* controller, fileTransfers) {
		82	if(controller->getState().type == FileTransfer::State::Finished
		83	\|\| controller->getState().type == FileTransfer::State::Failed
		84	\|\| controller->getState().type == FileTransfer::State::Canceled) {
		85	isClearable = true;
		86	break;
		87	}
		88	}
		89	return isClearable;
		90	}
		91
44	}	92	}


diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.h b/Swift/Controllers/FileTransfer/FileTransferOverview.h index 716666a..e3cbf81 100644 --- a/Swift/Controllers/FileTransfer/FileTransferOverview.h +++ b/Swift/Controllers/FileTransfer/FileTransferOverview.h
@@ -2,18 +2,24 @@
2	* Copyright (c) 2011 Tobias Markmann	2	* Copyright (c) 2011 Tobias Markmann
3	* Licensed under the simplified BSD license.	3	* Licensed under the simplified BSD license.
4	* See Documentation/Licenses/BSD-simplified.txt for more information.	4	* See Documentation/Licenses/BSD-simplified.txt for more information.
5	*/	5	*/
6		6
		7	/*
		8	* Copyright (c) 2015 Isode Limited.
		9	* All rights reserved.
		10	* See the COPYING file for more information.
		11	*/
		12
7	#pragma once	13	#pragma once
8		14
9	#include <vector>	15	#include <vector>
10		16
11	#include "Swift/Controllers/FileTransfer/FileTransferController.h"
12
13	#include <Swiften/Base/boost_bsignals.h>	17	#include <Swiften/Base/boost_bsignals.h>
14		18
		19	#include <Swift/Controllers/FileTransfer/FileTransferController.h>
		20
15	namespace Swift {	21	namespace Swift {
16		22
17	class ChatsManager;	23	class ChatsManager;
18	class FileTransferManager;	24	class FileTransferManager;
19		25
@@ -22,15 +28,20 @@ public:
22	FileTransferOverview(FileTransferManager*);	28	FileTransferOverview(FileTransferManager*);
23	~FileTransferOverview();	29	~FileTransferOverview();
24		30
25	void sendFile(const JID&, const std::string&);	31	void sendFile(const JID&, const std::string&);
26	const std::vector<FileTransferController*>& getFileTransfers() const;	32	const std::vector<FileTransferController*>& getFileTransfers() const;
		33	void clearFinished();
		34	bool isClearable() const;
27		35
28	boost::signal<void (FileTransferController*)> onNewFileTransferController;	36	boost::signal<void (FileTransferController*)> onNewFileTransferController;
		37	boost::signal<void ()> onFileTransferListChanged;
29		38
30	private:	39	private:
31	void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer);	40	void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer);
		41	void handleNewFileTransferController(FileTransferController* controller);
		42	void handleFileTransferStateChanged();
32		43
33	private:	44	private:
34	std::vector<FileTransferController*> fileTransfers;	45	std::vector<FileTransferController*> fileTransfers;
35	FileTransferManager *fileTransferManager;	46	FileTransferManager *fileTransferManager;
36	};	47	};