diff options
| author | saturneric <[email protected]> | 2025-02-16 12:36:41 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-02-16 12:36:41 +0000 |
| commit | 8dfe4599860656b90fe8fb7f855f25233cc25912 (patch) | |
| tree | f40584a9ac9b00e4523d6997714b791d0d91604a /src/ui | |
| parent | chore: update appstream info (diff) | |
| download | GpgFrontend-8dfe4599860656b90fe8fb7f855f25233cc25912.tar.gz GpgFrontend-8dfe4599860656b90fe8fb7f855f25233cc25912.zip | |
fix: do not check commit hash in flatpak container
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/key_generate/KeyGenerateDialog.cpp | 3 | ||||
| -rw-r--r-- | src/ui/main_window/MainWindowSlotFunction.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp index 39c39c91..a12db246 100644 --- a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp +++ b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp @@ -33,6 +33,7 @@ #include "core/function/gpg/GpgKeyOpera.h" #include "core/typedef/GpgTypedef.h" #include "core/utils/CacheUtils.h" +#include "core/utils/CommonUtils.h" #include "core/utils/GpgUtils.h" #include "ui/UISignalStation.h" #include "ui/UserInterfaceUtils.h" @@ -600,7 +601,7 @@ void KeyGenerateDialog::slot_easy_combination_changed(const QString& mode) { void KeyGenerateDialog::do_generate() { if (!GetSettings() .value("gnupg/use_pinentry_as_password_input_dialog", - QString::fromLocal8Bit(qgetenv("container")) != "flatpak") + !IsFlatpakENV()) .toBool() && !ui_->noPassphraseCheckBox->isChecked()) { SetCacheValue("PinentryContext", "NEW_PASSPHRASE"); diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index 8743c937..781c67d1 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -296,7 +296,7 @@ void MainWindow::slot_version_upgrade_notify() { [=]() { (new AboutDialog(tr("Update"), this))->show(); }); statusBar()->addPermanentWidget(b); - } else if (is_git_commit_hash_mismatch) { + } else if (is_git_commit_hash_mismatch && !IsFlatpakENV()) { QMessageBox::information( this, tr("Commit Hash Mismatch"), tr("The current version's commit hash does not match the official " |