diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index a35361e4f..6c303fe83 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -44,7 +44,6 @@ #include "common/RsCollectionFile.h" #include "gui/connect/ConnectFriendWizard.h" #include "gui/connect/ConfCertDialog.h" -#include "gui/chat/ChatDialog.h" #include #include @@ -63,7 +62,6 @@ #define HOST_SEARCH "search" #define HOST_CERTIFICATE "certificate" #define HOST_PUBLIC_MSG "public_msg" -#define HOST_PRIVATE_CHAT "private_chat" #define HOST_REGEXP "file|person|forum|channel|search|message|certificate|private_chat|public_msg" #define FILE_NAME "name" @@ -98,10 +96,6 @@ #define CERTIFICATE_DYNDNS "dyndns" #define CERTIFICATE_RADIX "radix" -#define PRIVATE_CHAT_TIME_STAMP "time_stamp" -#define PRIVATE_CHAT_STRING "encrypted_data" -#define PRIVATE_CHAT_GPG_ID "gpgid" - #define PUBLIC_MSG_TIME_STAMP "time_stamp" #define PUBLIC_MSG_SRC_PGP_ID "gpgid" #define PUBLIC_MSG_HASH "hash" @@ -208,17 +202,6 @@ void RetroShareLink::fromUrl(const QUrl& url) } } - if(url.host() == HOST_PRIVATE_CHAT) - { - bool ok ; - _type = TYPE_PRIVATE_CHAT ; - _time_stamp = urlQuery.queryItemValue(PRIVATE_CHAT_TIME_STAMP).toUInt(&ok) ; - _encrypted_chat_info = urlQuery.queryItemValue(PRIVATE_CHAT_STRING) ; - _GPGid = urlQuery.queryItemValue(PRIVATE_CHAT_GPG_ID) ; - - check() ; - return; - } if(url.host() == HOST_PUBLIC_MSG) { bool ok ; @@ -343,19 +326,6 @@ bool RetroShareLink::createFile(const QString& name, uint64_t size, const QStrin return valid(); } -bool RetroShareLink::createPrivateChatInvite(time_t time_stamp,const QString& gpg_id,const QString& encrypted_chat_info) -{ - clear() ; - - _type = TYPE_PRIVATE_CHAT ; - _time_stamp = time_stamp ; - _encrypted_chat_info = encrypted_chat_info ; - _GPGid = gpg_id ; - - check() ; - - return valid() ; -} bool RetroShareLink::createPublicMsgInvite(time_t time_stamp,const QString& issuer_pgp_id,const QString& hash) { clear() ; @@ -605,11 +575,6 @@ void RetroShareLink::check() _valid = false; break; - case TYPE_PRIVATE_CHAT: - if(!checkRadix64(_encrypted_chat_info)) _valid = false ; - if(!checkPGPId(_GPGid)) _valid = false ; - break ; - case TYPE_PUBLIC_MSG: if(!checkHash(_hash)) _valid = false ; if(!checkPGPId(_GPGid)) _valid = false ; @@ -686,16 +651,6 @@ QString RetroShareLink::title() const rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ; return QString("Click to send a private message to %1 (%2).").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; } - case TYPE_PRIVATE_CHAT: - { - RsPeerDetails detail; - rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ; - - if (_GPGid.toStdString() == rsPeers->getGPGOwnId().toStdString()) - return QString("Click to open a private chat canal to %1 (%2).").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; - else - return QString("This is a private chat invite for %1 (%2). You can't use it.").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; - } case TYPE_EXTRAFILE: return QString("%1 (%2, Extra - Source included)").arg(hash()).arg(misc::friendlyUnit(size())); case TYPE_FILE: @@ -774,15 +729,6 @@ QString RetroShareLink::toString() const break; - case TYPE_PRIVATE_CHAT: - url.setScheme(RSLINK_SCHEME) ; - url.setHost(HOST_PRIVATE_CHAT) ; - urlQuery.addQueryItem(PRIVATE_CHAT_TIME_STAMP,QString::number(_time_stamp)) ; - urlQuery.addQueryItem(PRIVATE_CHAT_GPG_ID,_GPGid) ; - urlQuery.addQueryItem(PRIVATE_CHAT_STRING,_encrypted_chat_info) ; - - break; - case TYPE_PUBLIC_MSG: url.setScheme(RSLINK_SCHEME) ; url.setHost(HOST_PUBLIC_MSG) ; @@ -869,9 +815,6 @@ QString RetroShareLink::niceName() const return PeerDefs::rsid(name().toUtf8().constData(), RsPgpId(hash().toStdString())); } - if(type() == TYPE_PRIVATE_CHAT) { - return QString("Private chat invite (Valid only for key %1)").arg(_GPGid); - } if(type() == TYPE_PUBLIC_MSG) { RsPeerDetails detail; rsPeers->getGPGDetails(RsPgpId(_GPGid.toStdString()), detail) ; @@ -1079,7 +1022,6 @@ static void processList(const QStringList &list, const QString &textSingular, co case TYPE_SEARCH: case TYPE_MESSAGE: case TYPE_CERTIFICATE: - case TYPE_PRIVATE_CHAT: case TYPE_PUBLIC_MSG: // no need to ask break; diff --git a/retroshare-gui/src/gui/RetroShareLink.h b/retroshare-gui/src/gui/RetroShareLink.h index 8ff5112b0..964b42541 100644 --- a/retroshare-gui/src/gui/RetroShareLink.h +++ b/retroshare-gui/src/gui/RetroShareLink.h @@ -86,7 +86,6 @@ class RetroShareLink bool createMessage(const RsPeerId &peerId, const QString& subject); bool createMessage(const RsGxsId &peerId, const QString& subject); bool createCertificate(const RsPeerId &ssl_id) ; - bool createPrivateChatInvite(time_t time_stamp,const QString& gpg_id,const QString& encrypted_chat_info) ; bool createPublicMsgInvite(time_t time_stamp,const QString& pgp_id,const QString& hash) ; bool createUnknwonSslCertificate(const RsPeerId &sslId, const RsPgpId &gpgId = RsPgpId()) ; @@ -107,7 +106,6 @@ class RetroShareLink const QString& location() const { return _location ; } const QString& radix() const { return _radix ; } time_t timeStamp() const { return _time_stamp ; } - const QString& encryptedPrivateChatInfo() const { return _encrypted_chat_info ; } QString title() const; unsigned int subType() const { return _subType; }