mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-02-09 21:28:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'Set Encryption': don't reuse current file after closing

Browse Source 
Otherwise db.currentFile() is empty.

See issue #2654 and discussion in #2579
This commit is contained in:
mgrojo
2021-04-04 13:31:55 +02:00
parent 2a830e5a3a
commit 967780d00b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MainWindow.cpp
View File

@@ -3201,10 +3201,12 @@ void MainWindow::editEncryption()
bool ok = db.releaseAllSavepoints();
qApp->processEvents();
const QString temporalFile = db.currentFile() + ".enctemp";
// Create the new file first or it won't work
if(ok)
{
QFile file(db.currentFile() + ".enctemp");
QFile file(temporalFile);
file.open(QFile::WriteOnly);
file.close();
}
@@ -3214,7 +3216,7 @@ void MainWindow::editEncryption()
// Attach a new database using the new settings
qApp->processEvents();
if(ok)
ok = db.executeSQL("ATTACH DATABASE '" + db.currentFile().toStdString() + ".enctemp' AS sqlitebrowser_edit_encryption KEY " + cipherSettings.getPassword() + ";",
ok = db.executeSQL("ATTACH DATABASE '" + temporalFile.toStdString() + "' AS sqlitebrowser_edit_encryption KEY " + cipherSettings.getPassword() + ";",
false, false);
qApp->processEvents();
if(ok)
@@ -3249,11 +3251,12 @@ void MainWindow::editEncryption()
{
// No errors: Then close the current database, switch names, open the new one and if that succeeded delete the old one
const QString currentFile = db.currentFile();
fileClose();
QFile::rename(db.currentFile(), db.currentFile() + ".enctempold");
QFile::rename(db.currentFile() + ".enctemp", db.currentFile());
if(fileOpen(db.currentFile()))
QFile::remove(db.currentFile() + ".enctempold");
QFile::rename(currentFile, temporalFile + "old");
QFile::rename(temporalFile, currentFile);
if(fileOpen(currentFile))
QFile::remove(temporalFile + "old");
} else {
QMessageBox::warning(this, qApp->applicationName(), db.lastError());
}