Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed clearing of PGP passphrase after creation of default identity

Browse Source
This commit is contained in:
csoler 2017-07-29 22:37:14 +02:00
parent 6f7e656d6c
commit 345f24eb5f
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -587,8 +587,6 @@ void GenCertDialog::genPerson()
std::cout << "RsAccounts::GenerateSSLCertificate" << std::endl; std::cout << "RsAccounts::GenerateSSLCertificate" << std::endl;
bool okGen = RsAccounts::GenerateSSLCertificate(PGPId, "", genLoc, "", isHiddenLoc, sslPasswd, sslId, err); bool okGen = RsAccounts::GenerateSSLCertificate(PGPId, "", genLoc, "", isHiddenLoc, sslPasswd, sslId, err);
rsNotify->clearPgpPassphrase() ;
if (okGen) if (okGen)
{ {
/* complete the process */ /* complete the process */

2
retroshare-gui/src/gui/StartDialog.cpp
View File

@ -117,8 +117,6 @@ void StartDialog::loadPerson()
bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ; bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
rsNotify->clearPgpPassphrase();
if(res) if(res)
accept(); accept();
} }

7
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -785,6 +785,13 @@ void NotifyQt::notifyListPreChange(int list, int /*type*/)
* uses Flags, to detect changes * uses Flags, to detect changes
*/ */
void NotifyQt::resetCachedPassphrases()
{
std::cerr << "Clearing PGP passphrase." << std::endl;
rsNotify->clearPgpPassphrase() ;
}
void NotifyQt::enable() void NotifyQt::enable()
{ {
QMutexLocker m(&_mutex) ; QMutexLocker m(&_mutex) ;

1
retroshare-gui/src/gui/notifyqt.h
View File

@ -155,6 +155,7 @@ class NotifyQt: public QObject, public NotifyClient
public slots: public slots:
void UpdateGUI(); /* called by timer */ void UpdateGUI(); /* called by timer */
void SetDisableAll(bool bValue); void SetDisableAll(bool bValue);
void resetCachedPassphrases() ;
private slots: private slots:
void runningTick(); void runningTick();

6
retroshare-gui/src/main.cpp
View File

@ -397,7 +397,6 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
uint32_t token = 0; uint32_t token = 0;
rsIdentity->createIdentity(token, params); rsIdentity->createIdentity(token, params);
} }
// I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to // I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
// avoid clashes between infos from threads. // avoid clashes between infos from threads.
// //
@ -443,6 +442,11 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
WebuiPage::checkStartWebui(); WebuiPage::checkStartWebui();
#endif // ENABLE_WEBUI #endif // ENABLE_WEBUI
// This is done using a timer, because the passphrase request from notify is asynchrouneous and therefore clearing the
// passphrase here makes it request for a passphrase when creating the default chat identity.
QTimer::singleShot(10000, Qt::CoarseTimer, notify, SLOT(resetCachedPassphrases())) ;
/* dive into the endless loop */ /* dive into the endless loop */
int ti = rshare.exec(); int ti = rshare.exec();
delete w ; delete w ;