Merge lp:~ahayzen/content-hub/abort-transfer-when-no-peer into lp:content-hub

[Andrew Hayzen]

* If the peer isn't valid then abort the transfer

* If the peer isn't valid then abort the transfer

[Ken VanDine (ken-vandine)]

I'm happy with this approach, please do the same for import and share as well.

[Ken VanDine (ken-vandine)]

This looks great, thanks!

review: Approve

[Andrew Hayzen (ahayzen)]

Rebased ontop of lp:~ahayzen/content-hub/printing-trusted-export so that the silo can build :-)

[lp:~ahayzen/content-hub/abort-transfer-when-no-peer]

322. By Andrew Hayzen on 2017-02-07

* Pull of lp:~ahayzen/content-hub/printing-trusted-export

323. By Andrew Hayzen on 2017-02-07

* Fix bad merge conflict resolution

324. By Andrew Hayzen on 2017-02-07

* Pull of lp:~ahayzen/content-hub/printing-trusted-export

[Ken VanDine (ken-vandine)]

Thanks

review: Approve

=== modified file 'include/com/ubuntu/content/hub.h'
--- include/com/ubuntu/content/hub.h	2017-02-07 15:01:58 +0000
+++ include/com/ubuntu/content/hub.h	2017-02-07 15:01:58 +0000
@@ -105,6 +105,8 @@
     void onPasteFormatsChanged(const QStringList &);
     void onPeerSelected(const QString &, const QString &);
     void onPeerSelectionCancelled(const QString &);
+
+    bool isPeerValid(Peer peer);
     void onPasteSelected(const QString &, QByteArray, bool);
     void onPasteSelectionCancelled(const QString &);
   protected:

=== modified file 'src/com/ubuntu/content/hub.cpp'
--- src/com/ubuntu/content/hub.cpp	2017-02-07 15:01:58 +0000
+++ src/com/ubuntu/content/hub.cpp	2017-02-07 15:01:58 +0000
@@ -51,10 +51,12 @@
             QDBusConnection::sessionBus(),
             parent))
     {
+        testing = !qgetenv("CONTENT_HUB_TESTING").isNull();
     }
 
     com::ubuntu::content::dbus::Service* service;
     QStringList pasteFormats;
+    bool testing;
 };
 
 cuc::Hub::Hub(QObject* parent) : QObject(parent), d{new cuc::Hub::Private{this}}
@@ -369,6 +371,12 @@
     cuc::Transfer *transfer = cuc::Transfer::Private::make_transfer(reply.value(), this);
     const cuc::Store *store = new cuc::Store{QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/HubIncoming/" + QString::number(transfer->id()), this};
     transfer->setStore(store);
+
+    if (!isPeerValid(peer)) {
+        TRACE() << Q_FUNC_INFO << "Aborting transfer as peer was not valid";
+        transfer->abort();
+    }
+
     return transfer;
 }
 
@@ -396,6 +404,12 @@
     TRACE() << Q_FUNC_INFO << "STORE:" << store->uri();
     transfer->setStore(store);
     transfer->start();
+
+    if (!isPeerValid(peer)) {
+        TRACE() << Q_FUNC_INFO << "Aborting transfer as peer was not valid";
+        transfer->abort();
+    }
+
     return transfer;
 }
 
@@ -422,6 +436,12 @@
     TRACE() << Q_FUNC_INFO << "STORE:" << store->uri();
     transfer->setStore(store);
     transfer->start();
+
+    if (!isPeerValid(peer)) {
+        TRACE() << Q_FUNC_INFO << "Aborting transfer as peer was not valid";
+        transfer->abort();
+    }
+
     return transfer;
 }
 
@@ -453,6 +473,11 @@
     return qdbus_cast<cuc::Peer>(peer.variant());
 }
 
+bool cuc::Hub::isPeerValid(Peer peer)
+{
+    return d->testing || info_for_app_id(peer.id()).value("valid", "false") == "true";
+}
+
 QDBusPendingCall cuc::Hub::createPaste(const QString &surfaceId, const QMimeData& mimeData)
 {
     /* This needs to be replaced with a better way to get the APP_ID */

=== modified file 'src/com/ubuntu/content/utils.cpp'
--- src/com/ubuntu/content/utils.cpp	2016-11-07 14:59:44 +0000
+++ src/com/ubuntu/content/utils.cpp	2017-02-07 15:01:58 +0000
@@ -231,6 +231,8 @@
     if (!qgetenv("CONTENT_HUB_TESTING").isNull())
         return map;
 
+    map["valid"] = "false";
+
     std::shared_ptr<ual::Registry> reg = ual::Registry::getDefault();
     auto app_id = ual::AppID::find(id.toStdString());
     if (app_id.empty()) {
@@ -240,6 +242,7 @@
             auto app = ual::Application::create(app_id, reg);
             map["name"] = QString::fromStdString(app.get()->info()->name());
             map["iconPath"] = QString::fromStdString(app.get()->info()->iconPath());
+            map["valid"] = "true";
         } catch (...) {
             qWarning() << Q_FUNC_INFO << "Failed to create Application for" << id;
         }