overload import function to provide keyserverUrl

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@552 34ebc366-c3a9-4b3c-9f84-69acf7962910

2 files changed, 15 insertions, 5 deletions

diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index c5c4e09..75d98f6 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -213,17 +213,26 @@ void KeyServerImportDialog::import()
         QString keyid = keysTable->item(keysTable->currentRow(),2)->text();
 
         // TODO: use string from combobox
-        // QUrl url = keyServerComboBox->currentText()+":11371/pks/lookup?op=get&search=0x"+keyid+"&options=mr";
-
-        import(QStringList(keyid));
+        //QUrl url = keyServerComboBox->currentText()+":11371/pks/lookup?op=get&search=0x"+keyid+"&options=mr";
+        QUrl url = keyServerComboBox->currentText();
+        import(QStringList(keyid), url);
    }
 }
 
 void KeyServerImportDialog::import(QStringList keyIds)
 {
+    // TODO: read default keyserver from settings
+    QUrl url("http://pgp.mit.edu");
+    import(keyIds, url);
+}
+
+
+void KeyServerImportDialog::import(QStringList keyIds, QUrl keyServerUrl)
+{
     foreach(QString keyId, keyIds) {
-        QUrl url = "http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x"+keyId+"&options=mr";
-        QNetworkReply *reply = qnam.get(QNetworkRequest(url));
+        QUrl reqUrl(keyServerUrl.scheme() + "://" + keyServerUrl.host() + ":11371/pks/lookup?op=get&search=0x"+keyId+"&options=mr");
+        qDebug() << "req to " << reqUrl;
+        QNetworkReply *reply = qnam.get(QNetworkRequest(reqUrl));
         connect(reply, SIGNAL(finished()),
                 this, SLOT(importFinished()));
     }
diff --git a/keyserverimportdialog.h b/keyserverimportdialog.h
index be9f681..2cf3dad 100644
--- a/keyserverimportdialog.h
+++ b/keyserverimportdialog.h
@@ -52,6 +52,7 @@ class KeyServerImportDialog : public QDialog
 public:
     KeyServerImportDialog(GpgME::Context *ctx, QWidget *parent = 0);
     void import(QStringList keyIds);
+    void import(QStringList keyIds, QUrl keyserverUrl);
 
 private slots:
     void import();