Merge lp:~renatofilho/indicator-transfer/app-id-dm into lp:indicator-transfer/15.10

[Renato Araujo Oliveira Filho]

Removed content hub dep from download manager plugin.

Uses download "app-id" property to show application information.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/39/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/app-id-dm]

37. By Renato Araujo Oliveira Filho on 2015-09-23

Fixed app info retrieve from click packages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/40/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/app-id-dm]

38. By Renato Araujo Oliveira Filho on 2015-09-24

Does not show downloads which has 'ShowInIndicator' marked as false.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/23/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/41/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/app-id-dm]

39. By Renato Araujo Oliveira Filho on 2015-09-25

Fixed memory leak.

[Charles Kerr (charlesk)]

Comments inline. Mostly looks good, a couple of minor variant leaks need fixing

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/42/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-transfer/app-id-dm]

40. By Renato Araujo Oliveira Filho on 2015-09-25

Parse "package-name" from download metadata.

"package-name" is used by update-manager when download update for exists apps.

41. By Renato Araujo Oliveira Filho on 2015-09-25

Fixed memory leaks.

[Renato Araujo Oliveira Filho (renatofilho)]

> Comments inline. Mostly looks good, a couple of minor variant leaks need
> fixing
All leaks fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/43/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Some nice improvements in this patch. LGTM

review: Approve

[lp:~renatofilho/indicator-transfer/app-id-dm]

42. By Renato Araujo Oliveira Filho on 2015-09-25

Fixed application icon name set.

43. By Renato Araujo Oliveira Filho on 2015-11-30

Trunk merged.

44. By Renato Araujo Oliveira Filho on 2015-12-16

Metadata.app_id has priority over destinationAppId.

45. By Renato Araujo Oliveira Filho on 2015-12-16

Run test sequential.

46. By Renato Araujo Oliveira Filho on 2015-12-16

Fix build rules.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-19 17:53:32 +0000
+++ CMakeLists.txt	2015-12-16 19:32:14 +0000
@@ -47,7 +47,8 @@
                   properties-cpp>=0.0.1
                   click-0.4>=0.4.30
                   json-glib-1.0
-                  ubuntu-app-launch-2)
+                  ubuntu-app-launch-2
+                  mirclient)
 include_directories(SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
 
 ##

=== modified file 'debian/rules'
--- debian/rules	2015-07-15 14:41:03 +0000
+++ debian/rules	2015-12-16 19:32:14 +0000
@@ -8,4 +8,5 @@
 override_dh_install:
 	dh_install --fail-missing
 
-
+override_dh_auto_test:
+	ctest -j1 --output-on-failure

=== modified file 'src/dm-plugin/dm-source.cpp'
--- src/dm-plugin/dm-source.cpp	2015-08-12 13:49:41 +0000
+++ src/dm-plugin/dm-source.cpp	2015-12-16 19:32:14 +0000
@@ -22,7 +22,9 @@
 #include <click.h>
 #include <ubuntu-app-launch.h>
 
+#include <glib/gstdio.h>
 #include <json-glib/json-glib.h>
+#include <gio/gdesktopappinfo.h>
 
 #include <algorithm>
 #include <iostream>
@@ -37,10 +39,6 @@
 static constexpr char const * DM_MANAGER_IFACE_NAME {"com.canonical.applications.DownloadManager"};
 static constexpr char const * DM_DOWNLOAD_IFACE_NAME {"com.canonical.applications.Download"};
 
-static constexpr char const * CH_BUS_NAME {"com.ubuntu.content.dbus.Service"};
-static constexpr char const * CH_TRANSFER_IFACE_NAME {"com.ubuntu.content.dbus.Transfer"};
-
-
 /**
  * A Transfer whose state comes from content-hub and ubuntu-download-manager.
  *
@@ -48,26 +46,20 @@
  * from ubuntu-download-manager. The ccad is used for pause/resume/cancel,
  * state change / download progress signals, etc.
  *
- * Each DMTransfer also tracks a com.ubuntu.content.dbus.Transfer (cucdt)
- * object from content-hub. The cucdt is used for learning the download's peer
- * and for calling Charge() to launch the peer's app.
  */
 class DMTransfer: public Transfer
 {
 public:
 
   DMTransfer(GDBusConnection* connection,
-             const std::string& ccad_path,
-             const std::string& cucdt_path):
+             const std::string& ccad_path):
     m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
     m_cancellable(g_cancellable_new()),
-    m_ccad_path(ccad_path),
-    m_cucdt_path(cucdt_path)
+    m_ccad_path(ccad_path)
   {
     id = next_unique_id();
     time_started = time(nullptr);
     get_ccad_properties();
-    get_cucdt_properties();
   }
 
   ~DMTransfer()
@@ -110,36 +102,29 @@
 
   void open()
   {
-    /* Once a transfer is complete, an app can be launched to process
-       it by calling Charge() with an empty variant list argument */
-    g_return_if_fail(!m_cucdt_path.empty());
-    g_dbus_connection_call(m_bus,
-                           CH_BUS_NAME,
-                           m_cucdt_path.c_str(),
-                           CH_TRANSFER_IFACE_NAME,
-                           "Charge",
-                           g_variant_new("(av)", nullptr),
-                           nullptr,
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1, // default timeout
-                           m_cancellable,
-                           on_cucdt_charge, // callback
-                           nullptr); // callback user_data
+      open_app();
   }
 
   void open_app()
   {
-    g_return_if_fail(!m_peer_name.empty());
-
-    gchar* app_id = ubuntu_app_launch_triplet_to_app_id(m_peer_name.c_str(), nullptr, nullptr);
-    g_debug("calling ubuntu_app_launch_start_application() for %s", app_id);
-    ubuntu_app_launch_start_application(app_id, nullptr);
-    g_free(app_id);
-  }
-
-  const std::string& cucdt_path() const
-  {
-    return m_cucdt_path;
+    // destination app has priority over app_id
+    std::string app_id = download_app_id();
+
+    if (app_id.empty() && !m_package_name.empty()) {
+        app_id = std::string(ubuntu_app_launch_triplet_to_app_id(m_package_name.c_str(),
+                                                                 "first-listed-app",
+                                                                 "current-user-version"));
+    }
+
+    if (app_id.empty())
+      {
+        g_warning("Fail to discovery app-id");
+      }
+    else
+      {
+        g_debug("calling ubuntu_app_launch_start_application() for %s", app_id.c_str());
+        ubuntu_app_launch_start_application(app_id.c_str(), nullptr);
+      }
   }
 
   const std::string& ccad_path() const
@@ -147,17 +132,6 @@
     return m_ccad_path;
   }
 
-  void handle_cucdt_signal(const gchar* signal_name, GVariant* parameters)
-  {
-    if (!g_strcmp0(signal_name, "StoreChanged"))
-      {
-        const gchar* uri = nullptr;
-        g_variant_get_child(parameters, 0, "&s", &uri);
-        if (uri != nullptr)
-          set_store(uri);
-      }
-  }
-
   void handle_ccad_signal(const gchar* signal_name, GVariant* parameters)
   {
     if (!g_strcmp0(signal_name, "started"))
@@ -234,12 +208,9 @@
 
 private:
 
-  static void on_cucdt_charge(GObject      * source,
-                              GAsyncResult * res,
-                              gpointer       /*unused*/)
+  const std::string& download_app_id() const
   {
-    auto v = connection_call_finish(source, res, "Error calling Charge()");
-    g_clear_pointer(&v, g_variant_unref);
+       return m_app_id.empty() ? m_destination_app : m_app_id;
   }
 
   void emit_changed_soon()
@@ -406,61 +377,6 @@
       }
   }
 
-  void set_store(const char* store)
-  {
-    /**
-     * This is a workaround until content-hub exposes a peer getter.
-     * As an interim step, this code sniffs the peer by looking at the store.
-     * the peer's listed in the directory component before HubIncoming, e.g.:
-     * "/home/phablet/.cache/com.ubuntu.gallery/HubIncoming/4"
-     */
-    char** strv = g_strsplit(store, "/", -1);
-    int i=0;
-    for ( ; strv && strv[i]; ++i)
-      if (!g_strcmp0(strv[i], "HubIncoming") && (i>0))
-        set_peer_name(strv[i-1]);
-    g_strfreev(strv);
-  }
-
-  void set_peer_name(const char* peer_name)
-  {
-    g_return_if_fail(peer_name && *peer_name);
-
-    g_debug("changing '%s' peer_name to '%s'", m_ccad_path.c_str(), peer_name);
-    m_peer_name = peer_name;
-
-    /* If we can find a click icon for the peer,
-       Use it as the transfer's icon */
-
-    GError* error = nullptr;
-    auto user = click_user_new_for_user(nullptr, nullptr, &error);
-    if (user != nullptr)
-      {
-        gchar* path = click_user_get_path(user, peer_name, &error);
-        if (path != nullptr)
-          {
-            auto manifest = click_user_get_manifest(user, peer_name, &error);
-            if (manifest != nullptr)
-              {
-                const auto icon_name = json_object_get_string_member(manifest, "icon");
-                if (icon_name != nullptr)
-                  {
-                    auto filename = g_build_filename(path, icon_name, nullptr);
-                    set_icon(filename);
-                    g_free(filename);
-                  }
-              }
-            g_free(path);
-          }
-      }
-
-    if (error != nullptr)
-      g_warning("Unable to get manifest for '%s' package: %s", peer_name, error->message);
-
-    g_clear_object(&user);
-    g_clear_error(&error);
-  }
-
   void set_icon(const char* filename)
   {
     const std::string tmp = filename ? filename : "";
@@ -473,35 +389,6 @@
   }
 
   /***
-  ****  Content Hub
-  ***/
-
-  void get_cucdt_properties()
-  {
-    const auto bus_name = CH_BUS_NAME;
-    const auto object_path = m_cucdt_path.c_str();
-    const auto interface_name = CH_TRANSFER_IFACE_NAME;
-
-    g_dbus_connection_call(m_bus, bus_name, object_path, interface_name,
-                           "Store", nullptr, G_VARIANT_TYPE("(s)"),
-                           G_DBUS_CALL_FLAGS_NONE, -1,
-                           m_cancellable, on_cucdt_store, this);
-  }
-
-  static void on_cucdt_store(GObject* source, GAsyncResult* res, gpointer gself)
-  {
-    auto v = connection_call_finish(source, res, "Unable to get store");
-    if (v != nullptr)
-      {
-        const gchar* store = nullptr;
-        g_variant_get_child(v, 0, "&s", &store);
-        if (store != nullptr)
-          static_cast<DMTransfer*>(gself)->set_store(store);
-        g_variant_unref(v);
-      }
-  }
-
-  /***
   ****  DownloadManager
   ***/
 
@@ -520,6 +407,25 @@
                            "progress", nullptr, G_VARIANT_TYPE("(t)"),
                            G_DBUS_CALL_FLAGS_NONE, -1,
                            m_cancellable, on_ccad_progress, this);
+
+    g_dbus_connection_call(m_bus, bus_name, object_path, interface_name,
+                           "metadata", nullptr, G_VARIANT_TYPE("(a{sv})"),
+                           G_DBUS_CALL_FLAGS_NONE, -1,
+                           m_cancellable, on_ccad_metadata, this);
+
+    g_dbus_connection_call(m_bus, bus_name, object_path,
+                           "org.freedesktop.DBus.Properties",
+                           "Get", g_variant_new ("(ss)", interface_name, "DestinationApp"),
+                           G_VARIANT_TYPE ("(v)"),
+                           G_DBUS_CALL_FLAGS_NONE, -1,
+                           m_cancellable, on_ccad_destination_app, this);
+
+    g_dbus_connection_call(m_bus, bus_name, object_path,
+                           "org.freedesktop.DBus.Properties",
+                           "Get", g_variant_new ("(ss)", interface_name, "Title"),
+                           G_VARIANT_TYPE ("(v)"),
+                           G_DBUS_CALL_FLAGS_NONE, -1,
+                           m_cancellable, on_ccad_title, this);
   }
 
   static void on_ccad_total_size(GObject      * source,
@@ -556,6 +462,91 @@
       }
   }
 
+  static void on_ccad_metadata(GObject      * source,
+                               GAsyncResult * res,
+                               gpointer       gself)
+  {
+    auto v = connection_call_finish(source, res, "Error calling metadata()");
+    if (v != nullptr)
+      {
+        auto self = static_cast<DMTransfer*>(gself);
+        GVariant *dict;
+        GVariantIter iter;
+        GVariant *value;
+        gchar *key;
+
+        dict = g_variant_get_child_value(v, 0);
+        g_variant_iter_init (&iter, dict);
+
+        self->m_app_id = "";
+        self->m_package_name = "";
+
+        while (g_variant_iter_next(&iter, "{sv}", &key, &value))
+          {
+            if (g_strcmp0(key, "app-id") == 0)
+              {
+                self->m_app_id = std::string(g_variant_get_string(value, nullptr));
+              }
+
+            // update-manager uses package-name
+            if (g_strcmp0(key, "package-name") == 0)
+              {
+                self->m_package_name = std::string(g_variant_get_string(value, nullptr));
+              }
+
+             // must free data for ourselves
+             g_variant_unref(value);
+             g_free (key);
+          }
+
+        g_variant_unref(dict);
+        g_debug("App id: %s", self->m_app_id.c_str());
+        g_debug("Package name: %s", self->m_package_name.c_str());
+        self->update_app_info();
+      }
+  }
+
+  static void on_ccad_destination_app(GObject      * source,
+                                      GAsyncResult * res,
+                                      gpointer       gself)
+  {
+    auto v = connection_call_finish(source, res, "Error getting destinationApp property");
+    if (v != nullptr)
+      {
+        GVariant *value, *item;
+        item = g_variant_get_child_value(v, 0);
+        value = g_variant_get_variant(item);
+        g_variant_unref(item);
+
+        auto self = static_cast<DMTransfer*>(gself);
+        self->m_destination_app = std::string(g_variant_get_string(value, nullptr));
+        g_debug("Destination app: %s", self->m_destination_app.c_str());
+        self->update_app_info();
+        g_variant_unref(v);
+      }
+  }
+
+  static void on_ccad_title(GObject      * source,
+                                      GAsyncResult * res,
+                                      gpointer       gself)
+  {
+    auto v = connection_call_finish(source, res, "Error getting Title property");
+    if (v != nullptr)
+      {
+        GVariant *value, *item;
+        item = g_variant_get_child_value(v, 0);
+        value = g_variant_get_variant(item);
+        g_variant_unref(item);
+
+        auto self = static_cast<DMTransfer*>(gself);
+        auto title = g_variant_get_string(value, nullptr);
+        g_debug("Download title: %s", title);
+        if (title && strlen(title))
+          self->set_title(title);
+        g_variant_unref(v);
+      }
+  }
+
   void call_ccad_method_no_args_no_response(const char* method_name)
   {
     const auto bus_name = DM_BUS_NAME;
@@ -570,6 +561,85 @@
                            m_cancellable, nullptr, nullptr);
   }
 
+  void update_app_info()
+  {
+    // destination app has priority over app_id
+    std::string app_id = download_app_id();
+
+    if (!app_id.empty())
+      update_app_info_from_app_id(app_id);
+    else if (!m_package_name.empty())
+      update_app_info_from_package_name(m_package_name);
+    else
+      g_warning("Download without app-id or package-name");
+  }
+
+  void update_app_info_from_package_name(const std::string &package_name)
+  {
+    std::string app_id = std::string(ubuntu_app_launch_triplet_to_app_id(package_name.c_str(),
+                                                                         "first-listed-app",
+                                                                         "current-user-version"));
+    if (!app_id.empty())
+      update_app_info_from_app_id(app_id);
+    else
+      g_warning("fail to retrive app-id from package: %s", package_name.c_str());
+  }
+
+  void update_app_info_from_app_id(const std::string &app_id)
+  {
+    gchar *app_dir;
+    gchar *app_desktop_file;
+
+    if (!ubuntu_app_launch_application_info(app_id.c_str(), &app_dir, &app_desktop_file))
+      {
+        g_warning("Fail to get app info: %s", app_id.c_str());
+        return;
+      }
+
+    g_debug("App data: %s : %s", app_dir, app_desktop_file);
+    gchar *full_app_desktop_file = g_build_filename(app_dir, app_desktop_file, nullptr);
+    GKeyFile *app_info = g_key_file_new();
+    GError *error = nullptr;
+
+    g_debug("Open desktop file: %s", full_app_desktop_file);
+    g_key_file_load_from_file(app_info, full_app_desktop_file, G_KEY_FILE_NONE, &error);
+    if (error)
+      {
+        g_warning("Fail to open desktop info: %s:%s", full_app_desktop_file, error->message);
+        g_free(full_app_desktop_file);
+        g_key_file_free(app_info);
+        g_error_free(error);
+      }
+    else
+      {
+        gchar *icon_name = g_key_file_get_string(app_info, "Desktop Entry", "Icon", &error);
+        if (error == nullptr)
+          {
+
+            gchar *full_icon_name = g_build_filename(app_dir, icon_name, nullptr);
+            g_debug("App icon: %s", icon_name);
+            g_debug("App full icon name: %s", full_icon_name);
+            // check if it is full path icon or a themed one
+            if (g_file_test(full_icon_name, G_FILE_TEST_EXISTS))
+              set_icon(full_icon_name);
+            else
+              set_icon(icon_name);
+            g_free(full_icon_name);
+          }
+        else
+          {
+            g_warning("Fail to retrive icon:", error->message);
+            g_error_free(error);
+          }
+        g_free(icon_name);
+      }
+
+    g_key_file_free(app_info);
+    g_free(full_app_desktop_file);
+    g_free(app_dir);
+    g_free(app_desktop_file);
+  }
+
   /***
   ****
   ***/
@@ -611,9 +681,10 @@
 
   GDBusConnection* m_bus = nullptr;
   GCancellable* m_cancellable = nullptr;
+  std::string m_app_id;
+  std::string m_destination_app;
+  std::string m_package_name;
   const std::string m_ccad_path;
-  const std::string m_cucdt_path;
-  std::string m_peer_name;
 };
 
 } // anonymous namespace
@@ -751,58 +822,9 @@
                                                  this,
                                                  nullptr);
         m_signal_subscriptions.insert(tag);
-
-        tag = g_dbus_connection_signal_subscribe(bus,
-                                                 CH_BUS_NAME,
-                                                 CH_TRANSFER_IFACE_NAME,
-                                                 nullptr,
-                                                 nullptr,
-                                                 nullptr,
-                                                 G_DBUS_SIGNAL_FLAGS_NONE,
-                                                 on_transfer_signal_static,
-                                                 this,
-                                                 nullptr);
-        m_signal_subscriptions.insert(tag);
-      }
-  }
-
-  static void on_transfer_signal_static(GDBusConnection* /*connection*/,
-                                        const gchar*     /*sender_name*/,
-                                        const gchar*       object_path,
-                                        const gchar*     /*interface_name*/,
-                                        const gchar*       signal_name,
-                                        GVariant*          parameters,
-                                        gpointer           gself)
-  {
-    static_cast<Impl*>(gself)->on_transfer_signal(object_path, signal_name, parameters);
-  }
-
-  void on_transfer_signal(const gchar* cucdt_path,
-                          const gchar* signal_name,
-                          GVariant* parameters)
-  {
-    gchar* variant_str = g_variant_print(parameters, TRUE);
-    g_debug("transfer signal: %s %s %s", cucdt_path, signal_name, variant_str);
-    g_free(variant_str);
-
-    if (!g_strcmp0(signal_name, "DownloadIdChanged"))
-      {
-        const char* ccad_path = nullptr;
-        g_variant_get_child(parameters, 0, "&s", &ccad_path);
-        g_return_if_fail(cucdt_path != nullptr);
-
-        // ensure this ccad/cucdt pair is tracked
-        if (!find_transfer_by_ccad_path(ccad_path))
-          create_new_transfer(ccad_path, cucdt_path);
-      }
-    else
-      {
-        // Route this signal to the DMTransfer for processing
-        auto transfer = find_transfer_by_cucdt_path(cucdt_path);
-        if (transfer)
-          transfer->handle_cucdt_signal(signal_name, parameters);
-      }
-  }
+    }
+  }
+
 
   static void on_download_signal(GDBusConnection* /*connection*/,
                                  const gchar*     /*sender_name*/,
@@ -821,6 +843,8 @@
     auto transfer = self->find_transfer_by_ccad_path(ccad_path);
     if (transfer)
       transfer->handle_ccad_signal(signal_name, parameters);
+    else
+      self->create_new_transfer(ccad_path);
   }
 
   /***
@@ -840,27 +864,45 @@
     return nullptr;
   }
 
-  std::shared_ptr<DMTransfer> find_transfer_by_cucdt_path(const std::string& path)
-  {
-    for (const auto& transfer : m_model->get_all())
-      {
-        const auto tmp = std::static_pointer_cast<DMTransfer>(transfer);
-
-        if (tmp && (path == tmp->cucdt_path()))
-          return tmp;
-      }
-
-    return nullptr;
-  }
-
-  void create_new_transfer(const std::string& ccad_path,
-                           const std::string& cucdt_path)
+  void create_new_transfer(const std::string& ccad_path)
   {
     // don't let transfers reappear after they've been cleared by the user
     if (m_removed_ccad.count(ccad_path))
       return;
 
-    auto new_transfer = std::make_shared<DMTransfer>(m_bus, ccad_path, cucdt_path);
+    // check if the download should appear on indicator
+    GError *error = nullptr;
+    auto show = g_dbus_connection_call_sync(m_bus, DM_BUS_NAME, ccad_path.c_str(),
+                                            "org.freedesktop.DBus.Properties",
+                                            "Get", g_variant_new ("(ss)", DM_DOWNLOAD_IFACE_NAME, "ShowInIndicator"),
+                                            G_VARIANT_TYPE ("(v)"),
+                                            G_DBUS_CALL_FLAGS_NONE, -1,
+                                            m_cancellable, &error);
+    if (show != nullptr)
+      {
+        GVariant *value, *item;
+        item = g_variant_get_child_value(show, 0);
+        value = g_variant_get_variant(item);
+        bool show_in_idicator = g_variant_get_boolean(value);
+
+        g_variant_unref(value);
+        g_variant_unref(item);
+        g_variant_unref(show);
+
+        if (!show_in_idicator)
+          {
+            m_removed_ccad.insert(ccad_path);
+            return;
+          }
+      }
+    else if (error != nullptr)
+      {
+        if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+          g_warning("Fail to retrieve 'ShowInIndicator' property: %s", error->message);
+        g_error_free(error);
+      }
+
+    auto new_transfer = std::make_shared<DMTransfer>(m_bus, ccad_path);
 
     m_model->add(new_transfer);