Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 14:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed calling onion address testing only when editing is done, and updating of DNS in certificate

Browse source
This commit is contained in:
csoler 2022-02-09 15:40:01 +01:00
parent a1502c2742
commit fc89ba0fb7
6 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare

@ -1 +1 @@
Subproject commit 05963ad041430bee30c1418de19aadc5320ad42c Subproject commit b86968cd178c06680a1d39375be4afc3e69874bf

4
retroshare-gui/src/gui/FriendServerControl.cpp
View file

@ -80,7 +80,7 @@ FriendServerControl::FriendServerControl(QWidget *parent)
QObject::connect(friendServerOnOff_CB,SIGNAL(toggled(bool)),this,SLOT(onOnOffClick(bool))); QObject::connect(friendServerOnOff_CB,SIGNAL(toggled(bool)),this,SLOT(onOnOffClick(bool)));
QObject::connect(torServerFriendsToRequest_SB,SIGNAL(valueChanged(int)),this,SLOT(onFriendsToRequestChanged(int))); QObject::connect(torServerFriendsToRequest_SB,SIGNAL(valueChanged(int)),this,SLOT(onFriendsToRequestChanged(int)));
QObject::connect(torServerAddress_LE,SIGNAL(textChanged(const QString&)),this,SLOT(onOnionAddressEdit(const QString&))); QObject::connect(torServerAddress_LE,SIGNAL(editingFinished()),this,SLOT(onOnionAddressEdit()));
QObject::connect(torServerPort_SB,SIGNAL(valueChanged(int)),this,SLOT(onOnionPortEdit(int))); QObject::connect(torServerPort_SB,SIGNAL(valueChanged(int)),this,SLOT(onOnionPortEdit(int)));
QObject::connect(mConnectionCheckTimer,SIGNAL(timeout()),this,SLOT(checkServerAddress())); QObject::connect(mConnectionCheckTimer,SIGNAL(timeout()),this,SLOT(checkServerAddress()));
@ -130,7 +130,7 @@ void FriendServerControl::onOnionPortEdit(int)
} }
} }
void FriendServerControl::onOnionAddressEdit(const QString&) void FriendServerControl::onOnionAddressEdit()
{ {
// Setup timer to auto-check the friend server address // Setup timer to auto-check the friend server address
mConnectionCheckTimer->stop(); mConnectionCheckTimer->stop();

2
retroshare-gui/src/gui/FriendServerControl.h
View file

@ -35,7 +35,7 @@ public:
protected slots: protected slots:
void onOnOffClick(bool b); void onOnOffClick(bool b);
void onOnionAddressEdit(const QString&); void onOnionAddressEdit();
void onOnionPortEdit(int); void onOnionPortEdit(int);
void onNbFriendsToRequestsChanged(int n); void onNbFriendsToRequestsChanged(int n);
void checkServerAddress(); void checkServerAddress();

13
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -125,9 +125,8 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
// add self nick and Avatar to Friends. // add self nick and Avatar to Friends.
RsPeerDetails pd ; RsPeerDetails pd ;
if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) { if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd))
ui.nicknameLabel->setText(QString::fromUtf8(pd.name.c_str()) + " (" + QString::fromUtf8(pd.location.c_str())+")"); ui.nicknameLabel->setText(QString::fromUtf8(pd.name.c_str()) + " (" + QString::fromUtf8(pd.location.c_str())+")");
}
int H = misc::getFontSizeFactor("HelpButton").height(); int H = misc::getFontSizeFactor("HelpButton").height();
QString hlp_str = tr( QString hlp_str = tr(
@ -260,13 +259,9 @@ void FriendsDialog::loadmypersonalstatus()
QString statustring = QString::fromUtf8(rsMsgs->getCustomStateString().c_str()); QString statustring = QString::fromUtf8(rsMsgs->getCustomStateString().c_str());
if (statustring.isEmpty()) if (statustring.isEmpty())
{
ui.mypersonalstatusLabel->setText(tr("Set your status message here.")); ui.mypersonalstatusLabel->setText(tr("Set your status message here."));
}
else else
{
ui.mypersonalstatusLabel->setText(statustring); ui.mypersonalstatusLabel->setText(statustring);
}
} }
void FriendsDialog::clearChatNotify() void FriendsDialog::clearChatNotify()
@ -283,13 +278,11 @@ void FriendsDialog::statusmessage()
/*static*/ bool FriendsDialog::isGroupChatActive() /*static*/ bool FriendsDialog::isGroupChatActive()
{ {
FriendsDialog *friendsDialog = dynamic_cast<FriendsDialog*>(MainWindow::getPage(MainWindow::Friends)); FriendsDialog *friendsDialog = dynamic_cast<FriendsDialog*>(MainWindow::getPage(MainWindow::Friends));
if (!friendsDialog) { if (!friendsDialog)
return false; return false;
}
if (friendsDialog->ui.tabWidget->currentWidget() == friendsDialog->ui.groupChatTab) { if (friendsDialog->ui.tabWidget->currentWidget() == friendsDialog->ui.groupChatTab)
return true; return true;
}
return false; return false;
} }

3
retroshare-gui/src/gui/HomePage.cpp
View file

@ -136,6 +136,7 @@ void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
{ {
case RsNetworkEventCode::LOCAL_IP_UPDATED: // [fallthrough] case RsNetworkEventCode::LOCAL_IP_UPDATED: // [fallthrough]
case RsNetworkEventCode::EXTERNAL_IP_UPDATED: // [fallthrough] case RsNetworkEventCode::EXTERNAL_IP_UPDATED: // [fallthrough]
case RsNetworkEventCode::DNS_UPDATED: // [fallthrough]
RsQThreadUtils::postToObject( [=]() RsQThreadUtils::postToObject( [=]()
{ {
updateCertificate(); updateCertificate();
@ -213,7 +214,7 @@ void HomePage::updateOwnCert()
} }
QString invite ; QString invite ;
RetroshareInviteFlags invite_flags = RetroshareInviteFlags::CURRENT_IP; RetroshareInviteFlags invite_flags = RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::DNS;
if(mIncludeAllIPs) if(mIncludeAllIPs)
invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY; invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;

6
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -205,9 +205,9 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.discComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses())); connect(ui.discComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses())); connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
connect(ui.localAddress, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); connect(ui.localAddress, SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
connect(ui.extAddress, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); connect(ui.extAddress, SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
connect(ui.dynDNS, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); connect(ui.dynDNS, SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
connect(ui.hiddenpage_proxyAddress_tor, SIGNAL(editingFinished()),this,SLOT(saveAddresses())); connect(ui.hiddenpage_proxyAddress_tor, SIGNAL(editingFinished()),this,SLOT(saveAddresses()));