Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Encode Radix in RSLinks.

Browse Source 
Because it can contains special characters like '+', '/'.
But this is not backward compatible.
This commit is contained in:
Phenom 2017-04-18 17:36:43 +02:00
parent 4faaaf7093
commit 3c5e61a297
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -309,8 +309,8 @@ void RetroShareLink::fromUrl(const QUrl& url)
if(url.host() == HOST_IDENTITY) { if(url.host() == HOST_IDENTITY) {
_type = TYPE_IDENTITY ; _type = TYPE_IDENTITY ;
QString name = urlQuery.queryItemValue(IDENTITY_NAME) ; QString name = decodedQueryItemValue(urlQuery, IDENTITY_NAME) ;
QString radix= urlQuery.queryItemValue(IDENTITY_GROUP) ; QString radix= decodedQueryItemValue(urlQuery, IDENTITY_GROUP) ;
QString gxsid= urlQuery.queryItemValue(IDENTITY_ID) ; QString gxsid= urlQuery.queryItemValue(IDENTITY_ID) ;
RsGxsId id(gxsid.toStdString()) ; RsGxsId id(gxsid.toStdString()) ;
@ -331,7 +331,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
if (url.host() == HOST_CERTIFICATE) { if (url.host() == HOST_CERTIFICATE) {
_type = TYPE_CERTIFICATE; _type = TYPE_CERTIFICATE;
_radix = urlQuery.queryItemValue(CERTIFICATE_RADIX); _radix = decodedQueryItemValue(urlQuery, CERTIFICATE_RADIX);
#ifdef DEBUG_RSLINK #ifdef DEBUG_RSLINK
std::cerr << "Got a certificate link!!" << std::endl; std::cerr << "Got a certificate link!!" << std::endl;
@ -765,7 +765,7 @@ QString RetroShareLink::toString() const
url.setHost(HOST_IDENTITY) ; url.setHost(HOST_IDENTITY) ;
urlQuery.addQueryItem(IDENTITY_ID,_hash) ; urlQuery.addQueryItem(IDENTITY_ID,_hash) ;
urlQuery.addQueryItem(IDENTITY_NAME,encodeItem(_name)) ; urlQuery.addQueryItem(IDENTITY_NAME,encodeItem(_name)) ;
urlQuery.addQueryItem(IDENTITY_GROUP,_radix_group_data) ; urlQuery.addQueryItem(IDENTITY_GROUP,encodeItem(_radix_group_data)) ;
break ; break ;
case TYPE_EXTRAFILE: case TYPE_EXTRAFILE:
@ -839,9 +839,9 @@ QString RetroShareLink::toString() const
case TYPE_CERTIFICATE: case TYPE_CERTIFICATE:
url.setScheme(RSLINK_SCHEME); url.setScheme(RSLINK_SCHEME);
url.setHost(HOST_CERTIFICATE) ; url.setHost(HOST_CERTIFICATE) ;
urlQuery.addQueryItem(CERTIFICATE_RADIX, _radix); urlQuery.addQueryItem(CERTIFICATE_RADIX, encodeItem(_radix));
urlQuery.addQueryItem(CERTIFICATE_NAME, _name); urlQuery.addQueryItem(CERTIFICATE_NAME, encodeItem(_name));
urlQuery.addQueryItem(CERTIFICATE_LOCATION, _location); urlQuery.addQueryItem(CERTIFICATE_LOCATION, encodeItem(_location));
break; break;
} }