StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Tweak re-enabling old history popups

Browse Source
This commit is contained in:
Dubslow 2015-02-04 16:31:09 -06:00
parent aa122bf246
commit b7800b66ca
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/widget/form/settings/privacyform.cpp
View File

@ -68,17 +68,21 @@ bool PrivacyForm::setChatLogsPassword()
{ {
Core* core = Core::getInstance(); Core* core = Core::getInstance();
SetPasswordDialog* dialog; SetPasswordDialog* dialog;
QString body = tr("Please set your new chat history password.");
if (core->isPasswordSet(Core::ptMain))
dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), this);
else
dialog = new SetPasswordDialog(body, QString(), this);
// check if an encrypted history exists because it was disabled earlier, and use it if possible // check if an encrypted history exists because it was disabled earlier, and use it if possible
QString path = HistoryKeeper::getHistoryPath(QString(), 1); QString path = HistoryKeeper::getHistoryPath(QString(), 1);
QByteArray salt = core->getSaltFromFile(path); QByteArray salt = core->getSaltFromFile(path);
bool haveEncHist = salt.size() > 0; bool haveEncHist = salt.size() > 0;
QString body = tr("Please set your new chat history password.");
if (haveEncHist)
body += "\n\n" + tr("It appears you have an unused encrypted chat history; if the password matches, it will be added to your current history.");
if (core->isPasswordSet(Core::ptMain))
dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), this);
else
dialog = new SetPasswordDialog(body, QString(), this);
do { do {
int r = dialog->exec(); int r = dialog->exec();
if (r == QDialog::Rejected) if (r == QDialog::Rejected)
@ -99,13 +103,17 @@ bool PrivacyForm::setChatLogsPassword()
{ {
Settings::getInstance().setEncryptLogs(true); Settings::getInstance().setEncryptLogs(true);
HistoryKeeper::getInstance()->importMessages(oldMessages); HistoryKeeper::getInstance()->importMessages(oldMessages);
if (haveEncHist)
{
Widget::getInstance()->reloadHistory(); Widget::getInstance()->reloadHistory();
Widget::getInstance()->showWarningMsgBox(tr("Successfully decrypted old chat history","popup title"), tr("You have succesfully decrypted the old chat history, and it has been added to your current history and re-encrypted.", "popup text"));
}
delete dialog; delete dialog;
return true; return true;
} }
else else
{ {
if (!Widget::getInstance()->askQuestion(tr("Old encrypted chat history", "popup title"), tr("There is currently an unused encrypted chat history, but the password you just entered doesn't match.\nWould you like to try again?", "This happens when enabling encryption after previously \"Disabling History\""))) if (!Widget::getInstance()->askQuestion(tr("Old encrypted chat history", "popup title"), tr("There is currently an unused encrypted chat history, but the password you just entered doesn't match.\nWould you like to try again?\nCanceling will delete the old history and set the password to what you just entered.", "This happens when enabling encryption after previously \"Disabling History\""), true, true))
haveEncHist = false; // logically this is really just a `break`, but conceptually this is more accurate haveEncHist = false; // logically this is really just a `break`, but conceptually this is more accurate
} }
} while (haveEncHist); } while (haveEncHist);