Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:14:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a shareable address return to address manager

Browse source
This commit is contained in:
Stephen Birarda 2016-08-23 11:18:42 -07:00
parent edd4f5853e
commit fbe784155e
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/DiscoverabilityManager.cpp
View file

@ -111,7 +111,7 @@ void DiscoverabilityManager::updateLocation() {
} }
// Update Steam // Update Steam
SteamClient::updateLocation(domainHandler.getHostname(), addressManager->currentFacingAddress()); SteamClient::updateLocation(domainHandler.getHostname(), addressManager->currentShareableAddress());
} }
void DiscoverabilityManager::handleHeartbeatResponse(QNetworkReply& requestReply) { void DiscoverabilityManager::handleHeartbeatResponse(QNetworkReply& requestReply) {

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

@ -63,15 +63,31 @@ QUrl AddressManager::currentAddress() const {
} }
QUrl AddressManager::currentFacingAddress() const { QUrl AddressManager::currentFacingAddress() const {
QUrl hifiURL; auto hifiURL = currentAddress();
hifiURL.setPath(currentFacingPath());
hifiURL.setScheme(HIFI_URL_SCHEME); return hifiURL;
hifiURL.setHost(_host); }
if (_port != 0 && _port != DEFAULT_DOMAIN_SERVER_PORT) {
hifiURL.setPort(_port); QUrl AddressManager::currentShareableAddress() const {
if (!_shareablePlaceName.isEmpty()) {
// if we have a shareable place name use that instead of whatever the current host is
QUrl hifiURL;
hifiURL.setScheme(HIFI_URL_SCHEME);
hifiURL.setHost(_shareablePlaceName);
hifiURL.setPath(currentPath());
return hifiURL;
} else {
return currentAddress();
} }
}
QUrl AddressManager::currentFacingShareableAddress() const {
auto hifiURL = currentShareableAddress();
hifiURL.setPath(currentFacingPath()); hifiURL.setPath(currentFacingPath());
return hifiURL; return hifiURL;
@ -372,9 +388,12 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const
if (placeName.isEmpty()) { if (placeName.isEmpty()) {
// we didn't get a set place name, check if there is a default or temporary domain name to use // we didn't get a set place name, check if there is a default or temporary domain name to use
const QString TEMPORARY_DOMAIN_NAME_KEY = "name"; const QString TEMPORARY_DOMAIN_NAME_KEY = "name";
const QString DEFAULT_DOMAIN_NAME_KEY = "default_place_name";
if (domainObject.contains(TEMPORARY_DOMAIN_NAME_KEY)) { if (domainObject.contains(TEMPORARY_DOMAIN_NAME_KEY)) {
placeName = domainObject[TEMPORARY_DOMAIN_NAME_KEY].toString(); placeName = domainObject[TEMPORARY_DOMAIN_NAME_KEY].toString();
} else if (domainObject.contains(DEFAULT_DOMAIN_NAME_KEY)) {
placeName = domainObject[DEFAULT_DOMAIN_NAME_KEY].toString();
} }
} }
@ -714,7 +733,8 @@ void AddressManager::refreshPreviousLookup() {
} }
void AddressManager::copyAddress() { void AddressManager::copyAddress() {
QApplication::clipboard()->setText(currentAddress().toString()); // assume that the address is being copied because the user wants a shareable address
QApplication::clipboard()->setText(currentShareableAddress().toString());
} }
void AddressManager::copyPath() { void AddressManager::copyPath() {

2
libraries/networking/src/AddressManager.h
View file

@ -59,6 +59,8 @@ public:
QUrl currentAddress() const; QUrl currentAddress() const;
QUrl currentFacingAddress() const; QUrl currentFacingAddress() const;
QUrl currentShareableAddress() const;
QUrl currentFacingShareableAddress() const;
QString currentPath(bool withOrientation = true) const; QString currentPath(bool withOrientation = true) const;
QString currentFacingPath() const; QString currentFacingPath() const;