1 files changed, 14 insertions, 55 deletions

diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp
index dccf1a56..6982c3a2 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -30,7 +30,8 @@ KeyList::KeyList(GpgME::GpgContext *ctx,
                  KeyListRow::KeyType selectType,
                  KeyListColumn::InfoType infoType,
                  QWidget *parent)
-        : QWidget(parent), mSelectType(selectType), mInfoType(infoType)
+        : QWidget(parent), mSelectType(selectType), mInfoType(infoType), appPath(qApp->applicationDirPath()),
+        settings(appPath + "/conf/gpgfrontend.ini", QSettings::IniFormat)
 {
     mCtx = ctx;
 
@@ -304,14 +305,12 @@ void KeyList::addMenuAction(QAction *act)
 
 void KeyList::dropEvent(QDropEvent* event)
 {
-//    importKeyDialog();
-    QSettings settings;
 
     auto *dialog = new QDialog();
 
     dialog->setWindowTitle(tr("Import Keys"));
     QLabel *label;
-    label = new QLabel(tr("You've dropped something on the keylist.\n gpg4usb will now try to import key(s).")+"\n");
+    label = new QLabel(tr("You've dropped something on the table.\n GpgFrontend will now try to import key(s).")+"\n");
 
     // "always import keys"-CheckBox
     auto *checkBox = new QCheckBox(tr("Always import without bothering."));
@@ -345,7 +344,7 @@ void KeyList::dropEvent(QDropEvent* event)
 
     if (event->mimeData()->hasUrls())
     {
-        foreach (QUrl tmp, event->mimeData()->urls())
+        for (const QUrl& tmp : event->mimeData()->urls())
         {
                 QFile file;
                 file.setFileName(tmp.toLocalFile());
@@ -380,56 +379,7 @@ void KeyList::dragEnterEvent(QDragEnterEvent *event)
 void KeyList::importKeys(QByteArray inBuffer)
 {
     GpgImportInformation result = mCtx->importKey(std::move(inBuffer));
-    new KeyImportDetailDialog(mCtx, result, this);
-}
-
-void KeyList::uploadKeyToServer(QByteArray *keys)
-{
-    QUrl reqUrl("http://localhost:11371/pks/add");
-    qnam = new QNetworkAccessManager(this);
-
-    QUrl params;
-    keys->replace("\n", "%0D%0A")
-            .replace("(", "%28")
-            .replace(")", "%29")
-            .replace("/", "%2F")
-            .replace(":", "%3A")
-            .replace("+","%2B")
-            .replace(' ', '+');
-
-    QUrlQuery q;
-
-    q.addQueryItem("keytext", *keys);
-
-    params = q.query(QUrl::FullyEncoded).toUtf8();
-
-    QNetworkRequest req(reqUrl);
-
-    req.setHeader(QNetworkRequest::ContentTypeHeader,"application/x-www-form-urlencoded");
-
-    QNetworkReply *reply = qnam->post(req,params.toEncoded());
-    connect(reply, SIGNAL(finished()),
-            this, SLOT(uploadFinished()));
-    qDebug() << "REQURL: " << reqUrl;
-    qDebug() << "PARAMS.ENCODED: " << params.toEncoded();
-}
-
-void KeyList::uploadFinished()
-{
-    auto *reply = qobject_cast<QNetworkReply *>(sender());
-
-    QByteArray response = reply->readAll();
-    qDebug() << "RESPNOSE: " << response.data();
-    //reply->readAll();
-    qDebug() << "ERROR: " << reply->error();
-    if (reply->error()) {
-        qDebug() << "Error while contacting keyserver!";
-        return;
-    } else {
-        qDebug() << "Success while contacting keyserver!";
-    }
-
-    reply->deleteLater();
+    new KeyImportDetailDialog(mCtx, result, false, this);
 }
 
 void KeyList::getCheckedKeys(QVector<GpgKey> &keys) {
@@ -472,3 +422,12 @@ void KeyList::getPrivateCheckedKeys(QVector<GpgKey> &keys) {
         }
     }
 }
+
+GpgKey KeyList::getSelectedKey() {
+    for (int i = 0; i < mKeyList->rowCount(); i++) {
+        if (mKeyList->item(i, 0)->isSelected() == 1) {
+            return buffered_keys[i];
+        }
+    }
+    return GpgKey();
+}