Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version

Browse source
This commit is contained in:
Seth Alves 2018-04-05 12:39:49 -07:00
parent 3bc764a020
commit 81ba875ad2
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/networking/src/AddressManager.cpp
View file

@ -60,6 +60,7 @@ QUrl AddressManager::currentFacingAddress() const {
} }
QUrl AddressManager::currentShareableAddress(bool domainOnly) const { QUrl AddressManager::currentShareableAddress(bool domainOnly) const {
QUrl shareableAddress;
if (!_shareablePlaceName.isEmpty()) { if (!_shareablePlaceName.isEmpty()) {
// if we have a shareable place name use that instead of whatever the current host is // if we have a shareable place name use that instead of whatever the current host is
QUrl hifiURL; QUrl hifiURL;
@ -71,10 +72,16 @@ QUrl AddressManager::currentShareableAddress(bool domainOnly) const {
hifiURL.setPath(currentPath()); hifiURL.setPath(currentPath());
} }
return hifiURL; shareableAddress = hifiURL;
} else { } else {
return currentAddress(domainOnly); shareableAddress = currentAddress(domainOnly);
} }
if (shareableAddress.scheme() == URL_SCHEME_HIFI) {
return QUrl(); // file: urls aren't shareable
}
return shareableAddress;
} }
QUrl AddressManager::currentFacingShareableAddress() const { QUrl AddressManager::currentFacingShareableAddress() const {
@ -288,6 +295,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
// lookupUrl.scheme() == URL_SCHEME_HTTP || // lookupUrl.scheme() == URL_SCHEME_HTTP ||
// lookupUrl.scheme() == URL_SCHEME_HTTPS || // lookupUrl.scheme() == URL_SCHEME_HTTPS ||
_previousLookup.clear(); _previousLookup.clear();
_shareablePlaceName.clear();
QUrl domainURL = PathUtils::expandToLocalDataAbsolutePath(lookupUrl); QUrl domainURL = PathUtils::expandToLocalDataAbsolutePath(lookupUrl);
setDomainInfo(domainURL, trigger); setDomainInfo(domainURL, trigger);
emit lookupResultsFinished(); emit lookupResultsFinished();
@ -818,7 +826,7 @@ void AddressManager::copyAddress() {
} }
// assume that the address is being copied because the user wants a shareable address // assume that the address is being copied because the user wants a shareable address
QGuiApplication::clipboard()->setText(currentShareableAddress().toString()); QGuiApplication::clipboard()->setText(currentFacingAddress().toString());
} }
void AddressManager::copyPath() { void AddressManager::copyPath() {