Removed additional HTTP extension references

keepassxreboot · Mar 31, 2018 · 9698549 · 9698549
1 parent 1a820a1
commit 9698549
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/docs/QUICKSTART.md b/docs/QUICKSTART.md
@@ -24,9 +24,10 @@ for all your websites, programs, etc.
 ## Setting up Browser Integration with KeePassXC
 
 * *Within KeePassXC*, go to **Tools->Settings** (on macOS, go to **KeePassXC->Preferences**.) 
-* In **Browser Integration**, check **Enable KeePassHTTP server**
+* In **Browser Integration**, check **Enable KeePassXC browser integration**
+* Right below that, click the checkbox for the browser(s) you use
 Leave the other options at their defaults.
-* *In your default web browser,* install the KeePassHTTP-Connector extension/add-on. Instructions for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepasshttp-connector/?src=api) or [Chrome](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb?utm_source=chrome-app-launcher-info-dialog) 
+* *In your default web browser,* install the KeePassXC Browser extension/add-on. Instructions for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) or [Chrome](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
 * Click the KeePassXC icon in the upper-right corner. You'll see the dialog below. 
 * Click the blue Connect button to make the browser extension connect to the KeePassXC application. 
 <img src="./KeePassXC-Connect.png" height="200" alt="KeePassXC Connect dialog">

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -369,30 +369,13 @@ MainWindow::MainWindow()
                                               "There is a high risk of corruption, maintain a backup of your databases.\n"
                                               "This version is not meant for production use."),
                                            MessageWidget::Warning, -1);
-#else
-    // Show the HTTP deprecation message if enabled above
-    emit m_ui->globalMessageWidget->hideAnimationFinished();
 #endif
 }
 
 MainWindow::~MainWindow()
 {
 }
 
-void MainWindow::showKeePassHTTPDeprecationNotice()
-{
-    int warningNum = config()->get("Http/DeprecationNoticeShown", 0).toInt();
-    displayGlobalMessage(tr("<p>It looks like you are using KeePassHTTP for browser integration. "
-                                "This feature has been deprecated and will be removed in the future.<br>"
-                                "Please switch to KeePassXC-Browser instead! For help with migration, "
-                                "visit our <a class=\"link\"  href=\"https://keepassxc.org/docs/keepassxc-browser-migration\">"
-                                "migration guide</a> (warning %1 of 3).</p>").arg(warningNum + 1),
-                         MessageWidget::Warning, true, -1);
-
-    config()->set("Http/DeprecationNoticeShown", warningNum + 1);
-    disconnect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), this, SLOT(showKeePassHTTPDeprecationNotice()));
-}
-
 void MainWindow::showErrorMessage(const QString& message)
 {
     m_ui->globalMessageWidget->showMessage(message, MessageWidget::Error);

diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
@@ -103,7 +103,6 @@ private slots:
     void repairDatabase();
     void hideTabMessage();
     void handleScreenLock();
-    void showKeePassHTTPDeprecationNotice();
     void showErrorMessage(const QString& message);
 
 private: