retry search with 0x prepended if it searchstring looks like hex

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

1 files changed, 12 insertions, 4 deletions

diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index 57e25d1..dc0cf98 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -149,18 +149,26 @@ void KeyServerImportDialog::searchFinished()
     QVariant redirectionTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
     if (reply->error()) {
         setMessage(tr("Couldn't contact keyserver!"),true);
+        //setMessage(reply->error());
+        qDebug() << reply->error();
     }
     if (firstLine.contains("Error"))
     {
         QString text= QString(reply->readLine(1024));
         if (text.contains("Too many responses")) {
             setMessage(tr("Too many responses from keyserver!"),true);
-        }
-        if (text.contains("No keys found")) {
+        } else if (text.contains("No keys found")) {
+            QRegExp rx("[0-9A-Fa-f]*");
+            QString query = searchLineEdit->text();
+            if (rx.exactMatch(query)) {
+               searchLineEdit->setText(query.prepend("0x"));
+               this->search();
+            }
             setMessage(tr("No keys found containing the search string!"),true);
-        }
-        if (text.contains("Insufficiently specific words")) {
+        } else if (text.contains("Insufficiently specific words")) {
             setMessage(tr("Insufficiently specific search string!"),true);
+        } else {
+            setMessage(text, true);
         }
     } else {
         int row = 0;