Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-06-09 21:29:20 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-07-07 13:00:23 (GMT)
commit2598ef4efcd74d5e9e701c62337bf84829572508 (patch)
treec60d7337a9f8932ed4a1d70e606d1ce2787f866f
parentf10c9618f8ccd9e44c9a45a69179883b39a445f5 (diff)
downloadswift-2598ef4efcd74d5e9e701c62337bf84829572508.zip
swift-2598ef4efcd74d5e9e701c62337bf84829572508.tar.bz2
Show old vCard in UI if vCard update is rejected by server
Previously QtVCardWidget would work on a shared copy of a VCard and modify the shared version. Now when setting the vCard on the widget it creates its own copy and works on that. The ProfileController holds a reference to the VCard it sets on the UI. If the server rejects an update it can reset the UI to this VCard. Test-Information: Tested against a XMPP server that rejects all vCard updates (mod_readonly). Change-Id: Iaa8eed6406f2dc6cc7ac5434194a7dae4f879b33
Diffstat
-rw-r--r--Swift/Controllers/ProfileController.cpp10
-rw-r--r--Swift/Controllers/ProfileController.h8
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp3
3 files changed, 12 insertions, 9 deletions
diff --git a/Swift/Controllers/ProfileController.cpp b/Swift/Controllers/ProfileController.cpp
index be7b72c..7df8036 100644
--- a/Swift/Controllers/ProfileController.cpp
+++ b/Swift/Controllers/ProfileController.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -8,12 +8,12 @@
8 8
9#include <boost/bind.hpp> 9#include <boost/bind.hpp>
10 10
11#include <Swiften/VCards/VCardManager.h>
12
13#include <Swift/Controllers/Intl.h>
11#include <Swift/Controllers/UIEvents/RequestProfileEditorUIEvent.h> 14#include <Swift/Controllers/UIEvents/RequestProfileEditorUIEvent.h>
12#include <Swift/Controllers/UIEvents/UIEventStream.h> 15#include <Swift/Controllers/UIEvents/UIEventStream.h>
13#include <Swift/Controllers/UIInterfaces/ProfileWindowFactory.h> 16#include <Swift/Controllers/UIInterfaces/ProfileWindowFactory.h>
14#include <Swiften/VCards/VCardManager.h>
15#include <Swift/Controllers/Intl.h>
16
17 17
18namespace Swift { 18namespace Swift {
19 19
@@ -61,6 +61,7 @@ void ProfileController::handleSetVCardResponse(ErrorPayload::ref error) {
61 pendingSetVCardRequest.reset(); 61 pendingSetVCardRequest.reset();
62 updateDialogStatus(); 62 updateDialogStatus();
63 if (error) { 63 if (error) {
64 profileWindow->setVCard(vcardBeforeEdit);
64 profileWindow->setError(QT_TRANSLATE_NOOP("", "There was an error publishing your profile data")); 65 profileWindow->setError(QT_TRANSLATE_NOOP("", "There was an error publishing your profile data"));
65 } 66 }
66 else { 67 else {
@@ -72,6 +73,7 @@ void ProfileController::handleSetVCardResponse(ErrorPayload::ref error) {
72void ProfileController::handleOwnVCardChanged(VCard::ref vcard) { 73void ProfileController::handleOwnVCardChanged(VCard::ref vcard) {
73 if (profileWindow) { 74 if (profileWindow) {
74 profileWindow->setVCard(vcard); 75 profileWindow->setVCard(vcard);
76 vcardBeforeEdit = vcard;
75 gettingVCard = false; 77 gettingVCard = false;
76 updateDialogStatus(); 78 updateDialogStatus();
77 } 79 }
diff --git a/Swift/Controllers/ProfileController.h b/Swift/Controllers/ProfileController.h
index 466834f..c6f5420 100644
--- a/Swift/Controllers/ProfileController.h
+++ b/Swift/Controllers/ProfileController.h
@@ -1,16 +1,17 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#pragma once 7#pragma once
8 8
9#include <Swift/Controllers/UIEvents/UIEvent.h>
10#include <Swiften/Elements/VCard.h>
11#include <Swiften/Elements/ErrorPayload.h> 9#include <Swiften/Elements/ErrorPayload.h>
10#include <Swiften/Elements/VCard.h>
12#include <Swiften/VCards/SetVCardRequest.h> 11#include <Swiften/VCards/SetVCardRequest.h>
13 12
13#include <Swift/Controllers/UIEvents/UIEvent.h>
14
14namespace Swift { 15namespace Swift {
15 class UIEventStream; 16 class UIEventStream;
16 class ProfileWindowFactory; 17 class ProfileWindowFactory;
@@ -40,6 +41,7 @@ namespace Swift {
40 SetVCardRequest::ref pendingSetVCardRequest; 41 SetVCardRequest::ref pendingSetVCardRequest;
41 ProfileWindow* profileWindow; 42 ProfileWindow* profileWindow;
42 bool gettingVCard; 43 bool gettingVCard;
44 VCard::ref vcardBeforeEdit;
43 }; 45 };
44} 46}
45 47
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
index 79360d8..ac087ed 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
@@ -13,7 +13,6 @@
13#include <Swift/QtUI/QtVCardWidget/QtVCardWidget.h> 13#include <Swift/QtUI/QtVCardWidget/QtVCardWidget.h>
14#include <Swift/QtUI/QtVCardWidget/ui_QtVCardWidget.h> 14#include <Swift/QtUI/QtVCardWidget/ui_QtVCardWidget.h>
15 15
16#include <QDebug>
17#include <QLineEdit> 16#include <QLineEdit>
18#include <QMenu> 17#include <QMenu>
19 18
@@ -112,7 +111,7 @@ void QtVCardWidget::setEditable(bool editable) {
112 111
113void QtVCardWidget::setVCard(VCard::ref vcard) { 112void QtVCardWidget::setVCard(VCard::ref vcard) {
114 clearFields(); 113 clearFields();
115 this->vcard = vcard; 114 this->vcard = boost::make_shared<VCard>(*vcard);
116 ui->photoAndName->setFormattedName(P2QSTRING(vcard->getFullName())); 115 ui->photoAndName->setFormattedName(P2QSTRING(vcard->getFullName()));
117 ui->photoAndName->setNickname(P2QSTRING(vcard->getNickname())); 116 ui->photoAndName->setNickname(P2QSTRING(vcard->getNickname()));
118 ui->photoAndName->setPrefix(P2QSTRING(vcard->getPrefix())); 117 ui->photoAndName->setPrefix(P2QSTRING(vcard->getPrefix()));