Qnx: Auto-generating SSH key used for connecting to a BB10 device

BlackBerryDeviceConfigurationWizardSshKeyPage wizard page has been removed.
It is not needed anymore. The wizard automatically generates or reuses
a SSH key that is stores in __settings__/qnx/id_rsa file. The same SSH key
is used for connecting to all BB10 devices.
The generation of 'default' SSH key is gone as a second step of
BlackBerryDeviceConfigurationWizardQueryPage wizard page.

Disabling device-tester for BlackBerryDeviceConfiguration.
Task-number: QTCREATORBUG-9977

Change-Id: Ice6068530c9c72fa82907decaaa3dca6077e9c3a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>

1 files changed, 12 insertions, 27 deletions

diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h
index 482fa8d8d4..79e549ca9d 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h
@@ -102,6 +102,11 @@ private:
 class BlackBerryDeviceConfigurationWizardQueryPage : public QWizardPage
 {
     Q_OBJECT
+    enum QueryState
+    {
+        Querying = 0, GeneratingSshKey, Done
+    };
+
 public:
     explicit BlackBerryDeviceConfigurationWizardQueryPage(BlackBerryDeviceConfigurationWizardHolder &holder, QWidget *parent = 0);
     ~BlackBerryDeviceConfigurationWizardQueryPage();
@@ -111,38 +116,18 @@ public:
 
 private slots:
     void processQueryFinished(int status);
+    void sshKeysGenerationFailed(const QString &error);
+    void processSshKeys(const QByteArray &privateKey, const QByteArray &publicKey);
 
 private:
+    void checkAndGenerateSSHKeys();
+    void queryDone();
+    void setState(QueryState state, const QString &message);
+
     Ui::BlackBerryDeviceConfigurationWizardQueryPage *m_ui;
     BlackBerryDeviceConfigurationWizardHolder &m_holder;
     BlackBerryDeviceInformation *m_deviceInformation;
-};
-
-class BlackBerryDeviceConfigurationWizardSshKeyPage : public QWizardPage
-{
-    Q_OBJECT
-public:
-    explicit BlackBerryDeviceConfigurationWizardSshKeyPage(QWidget *parent = 0);
-    ~BlackBerryDeviceConfigurationWizardSshKeyPage();
-
-    void initializePage();
-    bool isComplete() const;
-
-    QString privateKey() const;
-    QString publicKey() const;
-
-private slots:
-    void findMatchingPublicKey(const QString &privateKeyPath);
-
-    void sshKeysGenerationFailed(const QString &error);
-    void processSshKeys(const QString &privateKeyPath, const QByteArray &privateKey, const QByteArray &publicKey);
-    void generateSshKeys();
-
-private:
-    bool saveKeys(const QByteArray &privateKey, const QByteArray &publicKey, const QString &privateKeyPath, const QString &publicKeyPath);
-    void setBusy(bool busy);
-
-    Ui::BlackBerryDeviceConfigurationWizardSshKeyPage *m_ui;
+    QueryState m_state;
 };
 
 class BlackBerryDeviceConfigurationWizardConfigPage : public QWizardPage