Moving keyFile after password. (keepassxreboot#830)

* Moving keyFile after password. * Using tr() in unlockFromStdin.
stryku · Jul 31, 2017 · 839a61e · 839a61e
1 parent fe87748
commit 839a61e
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
@@ -403,27 +403,28 @@ Database* Database::openDatabaseFile(QString fileName, CompositeKey key)
 Database* Database::unlockFromStdin(QString databaseFilename, QString keyFilename)
 {
     CompositeKey compositeKey;
+    QTextStream outputTextStream(stdout);
+    QTextStream errorTextStream(stderr);
+
+    outputTextStream << QObject::tr("Insert password to unlock %1: ").arg(databaseFilename);
+    outputTextStream.flush();
+
+    QString line = Utils::getPassword();
+    PasswordKey passwordKey;
+    passwordKey.setPassword(line);
+    compositeKey.addKey(passwordKey);
 
     if (!keyFilename.isEmpty()) {
         FileKey fileKey;
         QString errorMessage;
         if (!fileKey.load(keyFilename, &errorMessage)) {
-            qCritical("Failed to load key file %s : %s", qPrintable(keyFilename), qPrintable(errorMessage));
+            errorTextStream << QObject::tr("Failed to load key file %1 : %2").arg(keyFilename).arg(errorMessage);
+            errorTextStream << endl;
             return nullptr;
         }
         compositeKey.addKey(fileKey);
     }
 
-    QTextStream outputTextStream(stdout);
-
-    outputTextStream << QString("Insert password to unlock " + databaseFilename + "\n> ");
-    outputTextStream.flush();
-
-    QString line = Utils::getPassword();
-    PasswordKey passwordKey;
-    passwordKey.setPassword(line);
-    compositeKey.addKey(passwordKey);
-
     return Database::openDatabaseFile(databaseFilename, compositeKey);
 }