Merge lp:~facundo/magicicada-client/remove-sync-menu into lp:magicicada-client

[Facundo Batista]

Remove SyncMenu traces - no more UI client except Magicicada own shiny thing.

[lp:~facundo/magicicada-client/remove-sync-menu]

1444. By Facundo Batista on 2018-04-23

Removed more unused constants.

1445. By Facundo Batista on 2018-04-24

Merged trunk in.

[Natalia Bidart (nataliabidart)]

+1

review: Approve

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2018-03-14 21:01:56 +0000
+++ contrib/testing/testcase.py	2018-04-24 23:14:39 +0000
@@ -58,8 +58,6 @@
     main,
     local_rescan,
     tritcask,
-    RECENT_TRANSFERS,
-    UPLOADING,
 )
 from ubuntuone.syncdaemon import logger
 from ubuntuone import platform
@@ -78,6 +76,10 @@
                      'password': 'test_password'}
 
 
+def NOOP(*a, **kw):
+    """Do nothing."""
+
+
 @contextlib.contextmanager
 def environ(env_var, new_value):
     """context manager to replace/add an environ value"""
@@ -190,14 +192,6 @@
     node_is_with_queued_move = cleanup = get_public_files = disconnect
 
 
-class FakeStatusListener(object):
-    """A fake StatusListener."""
-
-    def menu_data(self):
-        """Fake menu_data."""
-        return {RECENT_TRANSFERS: [], UPLOADING: []}
-
-
 class FakeMonitor(object):
     """A fake FilesystemMonitor."""
 
@@ -259,8 +253,8 @@
         self.vm = volume_manager.VolumeManager(self)
         self.fs = fs_manager.FileSystemManager(
             self.data_dir, self.partials_dir, self.vm, self.db)
-        self.event_q = event_queue.EventQueue(self.fs,
-                                              monitor_class=self._monitor_class)
+        self.event_q = event_queue.EventQueue(
+            self.fs, monitor_class=self._monitor_class)
         self.fs.register_eq(self.event_q)
         self.action_q = self._fake_AQ_class(self.event_q, self,
                                             *self._fake_AQ_params)
@@ -275,8 +269,6 @@
         self.lr = local_rescan.LocalRescan(self.vm, self.fs,
                                            self.event_q, self.action_q)
 
-        self.status_listener = FakeStatusListener()
-
     def _connect_aq(self, _):
         """Connect the fake action queue."""
         self.action_q.connect()
@@ -408,9 +400,8 @@
         self.patch(platform, "user_home", self.home_dir)
 
         # use the config from the branch
-        new_get_config_files = lambda: [os.path.join(os.environ['ROOTDIR'],
-                                                     'data', 'syncdaemon.conf')]
-        self.patch(config, 'get_config_files', new_get_config_files)
+        self.patch(config, 'get_config_files', lambda: [
+            os.path.join(os.environ['ROOTDIR'], 'data', 'syncdaemon.conf')])
 
         # fake a very basic config file with sane defaults for the tests
         config_dir = self.mktemp('config')
@@ -626,7 +617,7 @@
         try:
             result = super(FakedObject, self).__getattribute__(attr_name)
         except AttributeError:
-            result = lambda *a, **kw: None
+            result = NOOP
             super(FakedObject, self).__setattr__(attr_name, result)
 
         if attr_name == '_called':
 
=== modified file 'setup.py'
--- setup.py	2018-03-14 21:01:56 +0000
+++ setup.py	2018-04-24 23:14:39 +0000
@@ -71,7 +71,6 @@
             with open(fname, 'w') as out_file:
                 content = content.replace('@VERSION@', VERSION)
                 content = content.replace('@PROJECT_NAME@', PROJECT_NAME)
-                content = content.replace('@GETTEXT_PACKAGE@', PROJECT_NAME)
                 content = content.replace('@LOG_LEVEL@', LOG_LEVEL)
                 content = content.replace('@LOG_FILE_SIZE@', LOG_FILE_SIZE)
                 if prefix is not None:
 
=== modified file 'ubuntuone/clientdefs.py.in'
--- ubuntuone/clientdefs.py.in	2016-06-04 23:41:52 +0000
+++ ubuntuone/clientdefs.py.in	2018-04-24 23:14:39 +0000
@@ -1,8 +1,5 @@
-# ubuntuone.clientdefs - Configure-time definitions
-#
-# Author: David Planella <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -30,7 +27,6 @@
 # files in the program, then also delete it here.
 """Configure-time definitions for the client."""
 
-import gettext
 import os
 import platform
 import urllib
@@ -39,16 +35,11 @@
 VERSION = "@VERSION@"
 LOCALEDIR = "@localedir@"
 LIBEXECDIR = "@libexecdir@"
-GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"
-PROJECT_NAME = "@GETTEXT_PACKAGE@"
+PROJECT_NAME = "@PROJECT_NAME@"
 PROJECT_DIR = os.path.join('@prefix@', 'share', PROJECT_NAME)
 BIN_DIR = os.path.join('@prefix@', 'lib', PROJECT_NAME)
 
 
-def Q_(string):
-    return gettext.dgettext(GETTEXT_PACKAGE, string)
-
-
 def platform_data():
     result = {'platform': platform.system(),
               'platform_version': platform.release(),
 
=== modified file 'ubuntuone/platform/ipc/ipc_client.py'
--- ubuntuone/platform/ipc/ipc_client.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/ipc/ipc_client.py	2018-04-24 23:14:39 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -197,22 +198,6 @@
     def current_uploads(self):
         """Return a list of files with a upload in progress."""
 
-    @remote
-    def sync_menu(self):
-        """
-        This method returns a dictionary, with the following keys and values:
-
-        Key: 'recent-transfers'
-        Value: a list of strings (paths), each being the name of a file that
-               was recently transferred.
-
-        Key: 'uploading'
-        Value: a list of tuples, with each tuple having the following items:
-         * str: the path of a file that's currently being uploaded
-         * int: size of the file
-         * int: bytes written
-        """
-
     @signal
     def on_content_queue_changed(self):
         """Emit ContentQueueChanged."""
 
=== modified file 'ubuntuone/platform/ipc/linux.py'
--- ubuntuone/platform/ipc/linux.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/ipc/linux.py	2018-04-24 23:14:39 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -38,10 +39,6 @@
 from xml.etree import ElementTree
 
 from ubuntuone.platform import launcher
-from ubuntuone.syncdaemon import (
-    RECENT_TRANSFERS,
-    UPLOADING,
-)
 
 # Disable the "Invalid Name" check here, as we have lots of DBus style names
 
@@ -176,35 +173,6 @@
         warnings.warn('Use "waiting" method instead.', DeprecationWarning)
         return self.service.status.waiting_content()
 
-    @dbus.service.method(DBUS_IFACE_STATUS_NAME, out_signature='a{sv}')
-    def sync_menu(self):
-        """
-        This method returns a dictionary, with the following keys and values:
-
-        Key: 'recent-transfers'
-        Value: a list of strings (paths), each being the name of a file that
-               was recently transferred.
-
-        Key: 'uploading'
-        Value: a list of tuples, with each tuple having the following items:
-         * str: the path of a file that's currently being uploaded
-         * int: size of the file
-         * int: bytes written
-        """
-        data = self.service.status.sync_menu()
-        uploading = data[UPLOADING]
-        transfers = data[RECENT_TRANSFERS]
-        upload_data = dbus.Array(signature="(sii)")
-        transfer_data = dbus.Array(signature="s")
-        for up in uploading:
-            upload_data.append(dbus.Struct(up, signature="sii"))
-        for transfer in transfers:
-            transfer_data.append(transfer)
-        result = dbus.Dictionary(signature="sv")
-        result[UPLOADING] = upload_data
-        result[RECENT_TRANSFERS] = transfer_data
-        return result
-
     @dbus.service.signal(DBUS_IFACE_STATUS_NAME)
     def DownloadStarted(self, path):
         """Fire a signal to notify that a download has started."""
 
=== modified file 'ubuntuone/platform/ipc/perspective_broker.py'
--- ubuntuone/platform/ipc/perspective_broker.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/ipc/perspective_broker.py	2018-04-24 23:14:39 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -235,7 +236,6 @@
         'waiting',
         'waiting_metadata',
         'waiting_content',
-        'sync_menu',
     ]
 
     signal_mapping = {
@@ -296,10 +296,6 @@
         warnings.warn('Use "waiting" method instead.', DeprecationWarning)
         return self.service.status.waiting_content()
 
-    def sync_menu(self):
-        """Return the info necessary to construct the menu."""
-        return self.service.status.sync_menu()
-
     @signal
     def DownloadStarted(self, path):
         """Fire a signal to notify that a download has started."""
 
=== removed directory 'ubuntuone/platform/sync_menu'
=== removed file 'ubuntuone/platform/sync_menu/__init__.py'
--- ubuntuone/platform/sync_menu/__init__.py	2012-09-18 16:28:28 +0000
+++ ubuntuone/platform/sync_menu/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
-
-import sys
-
-
-if sys.platform in ("win32", "darwin"):
-    from ubuntuone.platform.sync_menu import common
-    source = common
-else:
-    from ubuntuone.platform.sync_menu import linux
-    source = linux
-
-UbuntuOneSyncMenu = source.UbuntuOneSyncMenu
 
=== removed file 'ubuntuone/platform/sync_menu/common.py'
--- ubuntuone/platform/sync_menu/common.py	2013-01-31 22:39:17 +0000
+++ ubuntuone/platform/sync_menu/common.py	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Dummy implementation of sync_menu lib for win32 and darwin."""
-
-
-class UbuntuOneSyncMenu(object):
-    """Integrate U1 with the Ubuntu Sync Menu."""
-    def __init__(self, *args, **kwargs):
-        """Match #args of linux syncmenu and do nothing."""
-
-    def update_transfers(self, *args, **kwargs):
-        """Do nothing."""
-
-    def sync_status_changed(self, *args, **kwargs):
-        """Do nothing."""
 
=== removed file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/platform/sync_menu/linux.py	1970-01-01 00:00:00 +0000
@@ -1,330 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012-2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
-
-import gettext
-import logging
-import time
-from twisted.python.util import OrderedDict
-from operator import itemgetter
-
-try:
-    from gi.repository import GLib as glib
-    from gi.repository import (
-        Dbusmenu,
-        Gdk,
-        Gio,
-        SyncMenu,
-    )
-    use_syncmenu = True
-except ImportError:
-    use_syncmenu = False
-
-from ubuntuone.clientdefs import GETTEXT_PACKAGE, NAME
-from ubuntuone.platform.sync_menu.common import (
-    UbuntuOneSyncMenu as DummySyncMenu,
-)
-
-
-logger = logging.getLogger("ubuntuone.platform.SyncMenu")
-
-
-def Q_(string):
-    return gettext.dgettext(GETTEXT_PACKAGE, string)
-
-
-GET_HELP = Q_("Get Help on the Web")
-GO_TO_WEB = Q_("Go to the main website")
-MORE_STORAGE = Q_("Get More Space")
-OPEN_U1 = Q_("Open")
-OPEN_U1_FOLDER = Q_("Open the main folder")
-SHARE_A_FILE = Q_("Share a File")
-TRANSFERS = Q_("Current and Recent Transfers")
-
-DELAY_BETWEEN_UPDATES = 3
-UBUNTUONE_LINK = u'https://one.ubuntu.com/'
-DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
-HELP_LINK = UBUNTUONE_LINK + u'support/'
-GET_STORAGE_LINK = UBUNTUONE_LINK + u'services/add-storage/'
-CLIENT_COMMAND_LINE = 'ubuntuone-control-panel-qt'
-CLIENT_DESKTOP_ID = 'ubuntuone-installer.desktop'
-
-
-class UbuntuOneSyncMenuLinux(object):
-    """Integrate U1 with the Ubuntu Sync Menu."""
-
-    def __init__(self, status, syncdaemon_service):
-        """Initialize menu."""
-        self._syncdaemon_service = syncdaemon_service
-        self._connected = True
-        self.timer = None
-        self._ignore_status_event = False
-        self.next_update = time.time()
-        self.root_menu = Dbusmenu.Menuitem()
-
-        self.open_u1 = Dbusmenu.Menuitem()
-        self.open_u1.property_set(Dbusmenu.MENUITEM_PROP_LABEL, OPEN_U1)
-        self.open_u1_folder = Dbusmenu.Menuitem()
-        self.open_u1_folder.property_set(
-            Dbusmenu.MENUITEM_PROP_LABEL, OPEN_U1_FOLDER)
-        self.share_file = Dbusmenu.Menuitem()
-        self.share_file.property_set(
-            Dbusmenu.MENUITEM_PROP_LABEL, SHARE_A_FILE)
-
-        self.go_to_web = Dbusmenu.Menuitem()
-        self.go_to_web.property_set(
-            Dbusmenu.MENUITEM_PROP_LABEL, GO_TO_WEB)
-
-        self.transfers = TransfersMenu(status)
-        self.transfers.property_set(
-            Dbusmenu.MENUITEM_PROP_LABEL, TRANSFERS)
-
-        self.more_storage = Dbusmenu.Menuitem()
-        self.more_storage.property_set(
-            Dbusmenu.MENUITEM_PROP_LABEL, MORE_STORAGE)
-
-        self.get_help = Dbusmenu.Menuitem()
-        self.get_help.property_set(
-            Dbusmenu.MENUITEM_PROP_LABEL, GET_HELP)
-
-        # Connect signals
-        self.open_u1.connect(
-            Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, self.open_control_panel)
-        self.open_u1_folder.connect(
-            Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
-            self.open_ubuntu_one_folder)
-        self.share_file.connect(
-            Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, self.open_share_file_tab)
-        self.go_to_web.connect(
-            Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, self.open_go_to_web)
-        self.get_help.connect(
-            Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, self.open_web_help)
-        self.more_storage.connect(
-            Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
-            self.open_get_more_storage)
-
-        # Add items
-        self.root_menu.child_append(self.open_u1)
-        self.root_menu.child_append(self.open_u1_folder)
-        self.root_menu.child_append(self.share_file)
-        self.root_menu.child_append(self.go_to_web)
-        self.root_menu.child_append(self.transfers)
-        self.root_menu.child_append(self.more_storage)
-        self.root_menu.child_append(self.get_help)
-
-        self.server = Dbusmenu.Server()
-        self.server.set_root(self.root_menu)
-        self.app = SyncMenu.App.new(CLIENT_DESKTOP_ID)
-        self.app.set_menu(self.server)
-        self.app.connect("notify::paused", self.change_sync_status)
-
-    def sync_status_changed(self, status):
-        """Listen to the changes for the sync status."""
-        if status != self._connected:
-            self._connected = status
-            self._ignore_status_event = True
-            self.app.set_paused(not self._connected)
-
-    def change_sync_status(self, *args):
-        """Triggered when the sync status is changed fromm the menu."""
-        if self._ignore_status_event:
-            self._ignore_status_event = False
-        elif self._connected:
-            self._syncdaemon_service.disconnect()
-            self._connected = False
-        else:
-            self._syncdaemon_service.connect()
-            self._connected = True
-
-    def _get_launch_context(self, timestamp):
-        """Returns the launch context for the current display"""
-        dpy = Gdk.Display.get_default()
-
-        if dpy:
-            context = dpy.get_app_launch_context()
-            context.set_timestamp(timestamp)
-            return context
-
-        return None
-
-    def _open_uri(self, uri, timestamp=0):
-        """Open an uri Using the default handler and the action timestamp"""
-        try:
-            Gio.AppInfo.launch_default_for_uri(
-                uri, self._get_launch_context(timestamp))
-        except glib.GError as e:
-            logger.warning('Failed to open the uri %s: %s.', uri, e)
-
-    def _open_control_panel_by_command_line(self, timestamp, args=''):
-        """Open the control panel by command line"""
-        flags = Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION
-        command_line = CLIENT_COMMAND_LINE
-        if len(args):
-            command_line += ' ' + args
-
-        try:
-            app = Gio.AppInfo.create_from_commandline(
-                command_line, NAME, flags)
-
-            if app:
-                app.launch([], self._get_launch_context(timestamp))
-        except glib.GError as e:
-            logger.warning('Failed to open the control panel: %s.' % e)
-
-    def open_control_panel(self, menuitem=None, timestamp=0):
-        """Open the Control Panel."""
-        app = Gio.DesktopAppInfo.new(CLIENT_DESKTOP_ID)
-
-        if app:
-            try:
-                app.launch([], self._get_launch_context(timestamp))
-            except glib.GError as e:
-                logger.warning('Failed to open the control panel: %s.' % e)
-        else:
-            self._open_control_panel_by_command_line(timestamp)
-
-    def open_ubuntu_one_folder(self, menuitem=None, timestamp=0):
-        """Open the folder."""
-        self._open_uri(
-            "file://" + self._syncdaemon_service.get_rootdir(), timestamp)
-
-    def open_share_file_tab(self, menuitem=None, timestamp=0):
-        """Open the Control Panel in the Share Tab."""
-        self._open_control_panel_by_command_line(
-            timestamp, "--switch-to share_links")
-
-    def open_go_to_web(self, menuitem=None, timestamp=0):
-        """Open the Help Page"""
-        self._open_uri(DASHBOARD, timestamp)
-
-    def open_web_help(self, menuitem=None, timestamp=0):
-        """Open the Help Page"""
-        self._open_uri(HELP_LINK, timestamp)
-
-    def open_get_more_storage(self, menuitem=None, timestamp=0):
-        """Open the Help Page"""
-        self._open_uri(GET_STORAGE_LINK, timestamp)
-
-    def _timeout(self, result):
-        """The aggregating timer has expired, so update the UI."""
-        self.next_update = int(time.time()) + DELAY_BETWEEN_UPDATES
-        self.transfers.update_progress()
-
-    def update_transfers(self):
-        """Set up a timer if there isn't one ticking and update the ui.
-
-        NOOP. Left behind for API compatibility, will be removed later when
-        all interaction with old syncmeny and desktop GUIs go away.
-        """
-
-
-class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
-    """Menu that handles the recent and current transfers."""
-
-    def __init__(self, status_frontend):
-        super(TransfersMenu, self).__init__()
-        self.status_frontend = status_frontend
-        self.uploading = {}
-        self.previous_transfers = []
-        self._transfers_items = {}
-        self._uploading_items = {}
-        self.separator = None
-
-    def update_progress(self):
-        """Update the list of recent transfers and current transfers."""
-        recent_transfers = self.status_frontend.recent_transfers()
-        current_transfers = self.status_frontend.files_uploading()
-        current_transfers.sort(key=itemgetter(2))
-        current_transfers.reverse()
-        uploading_data = OrderedDict()
-        for filename, size, written in current_transfers:
-            uploading_data[filename] = (size, written)
-
-        temp_transfers = {}
-        if recent_transfers != self.previous_transfers:
-            logger.debug("Update recent transfers with: %r", recent_transfers)
-            for item_transfer in self._transfers_items:
-                self.child_delete(self._transfers_items[item_transfer])
-            for item in recent_transfers:
-                recent_file = Dbusmenu.Menuitem()
-                recent_file.property_set(
-                    Dbusmenu.MENUITEM_PROP_LABEL, item.replace('_', '__'))
-                self.child_add_position(recent_file, 0)
-                temp_transfers[item] = recent_file
-            self._transfers_items = temp_transfers
-
-        if self.separator is None:
-            self.separator = Dbusmenu.Menuitem()
-            self.separator.property_set(
-                Dbusmenu.MENUITEM_PROP_TYPE, Dbusmenu.CLIENT_TYPES_SEPARATOR)
-            self.child_append(self.separator)
-
-        items_added = 0
-        remove = []
-        for item in self._uploading_items:
-            if item in uploading_data.keys():
-                size, written = uploading_data[item]
-                percentage = written * 100 / size
-                upload_item = self._uploading_items[item]
-                upload_item.property_set_int(
-                    SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE,
-                    percentage)
-                logger.debug(
-                    "Current transfer %s progress update: %r",
-                    item, percentage)
-                items_added += 1
-            else:
-                self.child_delete(self._uploading_items[item])
-                remove.append(item)
-        for item in remove:
-            self._uploading_items.pop(item)
-        if items_added < 5:
-            for item in uploading_data.keys():
-                if item not in self._uploading_items and items_added < 5:
-                    size, written = uploading_data[item]
-                    percentage = written * 100 / size
-                    uploading_file = Dbusmenu.Menuitem()
-                    uploading_file.property_set(
-                        Dbusmenu.MENUITEM_PROP_LABEL, item.replace('_', '__'))
-                    uploading_file.property_set(
-                        Dbusmenu.MENUITEM_PROP_TYPE,
-                        SyncMenu.PROGRESS_MENUITEM_TYPE)
-                    uploading_file.property_set_int(
-                        SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE,
-                        percentage)
-                    logger.debug("Current transfer %s created", item)
-                    self.child_append(uploading_file)
-                    self._uploading_items[item] = uploading_file
-                    items_added += 1
-
-
-if use_syncmenu:
-    UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
-else:
-    UbuntuOneSyncMenu = DummySyncMenu
 
=== modified file 'ubuntuone/platform/tests/ipc/test_external_interface.py'
--- ubuntuone/platform/tests/ipc/test_external_interface.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/tests/ipc/test_external_interface.py	2018-04-24 23:14:39 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -40,10 +41,6 @@
     StatusTestCase,
     SyncDaemonTestCase,
 )
-from ubuntuone.syncdaemon import (
-    RECENT_TRANSFERS,
-    UPLOADING,
-)
 
 STR = 'something'
 STR_STR_DICT = {'foo': 'bar'}
@@ -68,7 +65,7 @@
         ('ContentQueueChanged', ()),
         ('MetaQueueChanged', ()),
         ('RequestQueueAdded', (STR, STR, STR_STR_DICT)),
-        ('RequestQueueRemoved',  (STR, STR, STR_STR_DICT)),
+        ('RequestQueueRemoved', (STR, STR, STR_STR_DICT)),
     ]
 
     @defer.inlineCallbacks
@@ -136,16 +133,6 @@
         self.assert_remote_method(
             'waiting_metadata', in_signature=None, out_signature='a(sa{ss})')
 
-    @defer.inlineCallbacks
-    def test_sync_menu(self):
-        """Test sync_menu."""
-        result = {RECENT_TRANSFERS: [], UPLOADING: []}
-        method = 'sync_menu'
-        yield self.assert_method_called(self.service.status,
-                                        method, result)
-        self.assert_remote_method(
-            method, in_signature=None, out_signature='a{sv}')
-
 
 class EventsTests(EventsTestCase):
     """Basic tests for the Events exposed object."""
 
=== removed directory 'ubuntuone/platform/tests/sync_menu'
=== removed file 'ubuntuone/platform/tests/sync_menu/__init__.py'
--- ubuntuone/platform/tests/sync_menu/__init__.py	2012-09-18 16:22:15 +0000
+++ ubuntuone/platform/tests/sync_menu/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""SyncMenu test code."""
 
=== removed file 'ubuntuone/platform/tests/sync_menu/test_common.py'
--- ubuntuone/platform/tests/sync_menu/test_common.py	2012-10-15 21:20:54 +0000
+++ ubuntuone/platform/tests/sync_menu/test_common.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Test the common dummy Sync Menu implementation for win32/darwin."""
-
-from collections import Callable
-
-from twisted.trial.unittest import TestCase
-
-from ubuntuone.platform.sync_menu import common
-
-
-class SyncMenuDummyTestCase(TestCase):
-    """Test the SyncMenu."""
-
-    def test_dummy_support(self):
-        """Can we create a Dummy with the same #args as the real obj."""
-        dummy = common.UbuntuOneSyncMenu(1, 2)
-        self.assertIsInstance(dummy, common.UbuntuOneSyncMenu)
-
-    def test_dummy_has_update_transfers(self):
-        """Check that the dummy has the proper methods required by the API."""
-        dummy = common.UbuntuOneSyncMenu(1, 2)
-        self.assertIsInstance(dummy.update_transfers, Callable)
-
-    def test_dummy_has_sync_status_changed(self):
-        """Check that the dummy has the proper methods required by the API."""
-        dummy = common.UbuntuOneSyncMenu(1, 2)
-        self.assertIsInstance(dummy.sync_status_changed, Callable)
 
=== removed file 'ubuntuone/platform/tests/sync_menu/test_linux.py'
--- ubuntuone/platform/tests/sync_menu/test_linux.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/tests/sync_menu/test_linux.py	1970-01-01 00:00:00 +0000
@@ -1,586 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Test the Sync Menu."""
-
-import time
-from collections import Callable
-
-from twisted.internet import defer
-from twisted.trial.unittest import TestCase
-
-from ubuntuone.platform import sync_menu
-from ubuntuone.platform.sync_menu import linux
-
-
-def fake_call_later(*args):
-    """Fake reactor.callLater."""
-
-
-class FakeStatusFrontend(object):
-    """Fake StatusFrontend."""
-
-    def __init__(self):
-        self.recent_transfers_data = []
-        self.uploading_data = []
-
-    def recent_transfers(self):
-        """Return the fake recent transfers files."""
-        return self.recent_transfers_data
-
-    def files_uploading(self):
-        """Return the fake files being upload."""
-        return self.uploading_data
-
-
-class FakeAppLaunchContext(object):
-    def set_timestamp(self, timestamp):
-        self.timestamp = timestamp
-
-
-class FakeGdkDisplay(object):
-    """Fake Gdk.Display"""
-    def get_app_launch_context(self):
-        return FakeAppLaunchContext()
-
-
-class FakeNullGdk(object):
-    """Fake Gdk.Display with no default"""
-    @staticmethod
-    def get_default():
-        return None
-
-
-class FakeAppInfo(object):
-    """Fake Gio.AppInfo"""
-    instance = None
-    name = ""
-    desktop_id = ""
-    command_line = ""
-    opened_uri = ""
-    launched = True
-    context = None
-    files = []
-    flags = 0
-
-    def __new__(cls, *args, **kwargs):
-        cls.instance = super(FakeAppInfo, cls).__new__(cls, *args, **kwargs)
-        return cls.instance
-
-    def __init__(self, command_line="", name="", flags=0):
-        self.command_line = command_line
-        self.name = name
-        self.flags = flags
-
-    @classmethod
-    def launch_default_for_uri(cls, uri, context):
-        cls.opened_uri = uri
-        cls.context = context
-
-    @classmethod
-    def create_from_commandline(cls, command_line, name, flags):
-        cls.instance.__init__(command_line, name, flags)
-        return cls.instance
-
-    def launch(self, files, context):
-        self.launched = True
-        self.files = files
-        self.context = context
-
-
-class FakeDesktopAppInfo(FakeAppInfo):
-    """Fake Gio.DestkopAppInfo"""
-    def __init__(self, desktop_id=""):
-        super(FakeDesktopAppInfo, self).__init__()
-        self.desktop_id = desktop_id
-
-    @classmethod
-    def new(cls, desktop_id):
-        cls.instance.__init__(desktop_id)
-        return cls.instance
-
-
-class FakeSyncdaemonService(object):
-    """Fake SyncdaemonService."""
-
-    def __init__(self):
-        self.connect_called = False
-        self.disconnect_called = False
-        self.fake_root_path = "/home/user/Magicicada"
-
-    def connect(self):
-        """Set connect to True."""
-        self.connect_called = True
-
-    def disconnect(self):
-        """Set connect to True."""
-        self.disconnect_called = True
-
-    def get_rootdir(self):
-        """Return a fake ubuntu one folder path."""
-        return self.fake_root_path
-
-
-class FakeSyncMenuApp(object):
-    """Fake SyncMenu."""
-
-    data = {}
-
-    @classmethod
-    def new(cls, *args):
-        return FakeSyncMenuApp()
-
-    @classmethod
-    def clean(cls):
-        """Clear the values stored in data."""
-        FakeSyncMenuApp.data = {}
-
-    def set_menu(self, server):
-        """Set the menu for SyncMenu App."""
-        self.data['server'] = server
-
-    def connect(self, signal, callback):
-        """Fake connect."""
-        self.data['connect'] = (signal, callback)
-
-    def set_paused(self, status):
-        """Set the pause state."""
-        self.data['paused'] = status
-
-
-class SyncMenuDummyTestCase(TestCase):
-    """Test the SyncMenu."""
-
-    def test_dummy_support(self):
-        """Check that the Dummy object can be created properly."""
-        dummy = linux.DummySyncMenu('random', 'args')
-        self.assertIsInstance(dummy, linux.DummySyncMenu)
-
-    def test_dummy_has_update_transfers(self):
-        """Check that the dummy has the proper methods required by the API."""
-        dummy = linux.DummySyncMenu('random', 'args')
-        self.assertIsInstance(dummy.update_transfers, Callable)
-        self.assertIsInstance(dummy.sync_status_changed, Callable)
-
-
-class SyncMenuTestCase(TestCase):
-    """Test the SyncMenu."""
-
-    skip = None if linux.use_syncmenu else "SyncMenu not installed."
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(SyncMenuTestCase, self).setUp()
-        self.patch(linux.SyncMenu, "App", FakeSyncMenuApp)
-        self.patch(linux.Gdk.Display, "get_default", FakeGdkDisplay)
-        FakeSyncMenuApp.clean()
-        self.syncdaemon_service = FakeSyncdaemonService()
-        self.status_frontend = FakeStatusFrontend()
-        self._paused = False
-        self.sync_menu = sync_menu.UbuntuOneSyncMenu(
-            self.status_frontend, self.syncdaemon_service)
-
-    def test_init(self):
-        """Check that the menu is properly initialized."""
-        self.assertIsInstance(
-            FakeSyncMenuApp.data['server'], linux.Dbusmenu.Server)
-        self.assertEqual(
-            self.sync_menu.open_u1.get_parent(), self.sync_menu.root_menu)
-        self.assertEqual(
-            self.sync_menu.go_to_web.get_parent(), self.sync_menu.root_menu)
-        self.assertEqual(
-            self.sync_menu.more_storage.get_parent(), self.sync_menu.root_menu)
-        self.assertEqual(
-            self.sync_menu.get_help.get_parent(), self.sync_menu.root_menu)
-        self.assertEqual(
-            self.sync_menu.transfers.get_parent(), self.sync_menu.root_menu)
-        self.assertEqual(
-            self.sync_menu.open_u1_folder.get_parent(),
-            self.sync_menu.root_menu)
-        self.assertEqual(
-            self.sync_menu.share_file.get_parent(), self.sync_menu.root_menu)
-
-        def get_prop(item):
-            return item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
-
-        self.assertEqual(
-            get_prop(self.sync_menu.open_u1), linux.OPEN_U1)
-        self.assertEqual(
-            get_prop(self.sync_menu.open_u1_folder), linux.OPEN_U1_FOLDER)
-        self.assertEqual(
-            get_prop(self.sync_menu.share_file), linux.SHARE_A_FILE)
-        self.assertEqual(
-            get_prop(self.sync_menu.go_to_web), linux.GO_TO_WEB)
-        self.assertEqual(
-            get_prop(self.sync_menu.transfers), linux.TRANSFERS)
-        self.assertEqual(
-            get_prop(self.sync_menu.more_storage), linux.MORE_STORAGE)
-        self.assertEqual(
-            get_prop(self.sync_menu.get_help), linux.GET_HELP)
-
-        self.sync_menu.transfers.update_progress()
-        self.assertIsInstance(
-            self.sync_menu.transfers.separator, linux.Dbusmenu.Menuitem)
-
-    def test_get_launch_context_with_display(self):
-        """Check that the proper context is returned."""
-        timestamp = time.time()
-        context = self.sync_menu._get_launch_context(timestamp)
-        self.assertEqual(timestamp, context.timestamp)
-
-    def test_get_launch_context_with_no_display(self):
-        """Check that the proper context is returned."""
-        self.patch(linux.Gdk, "Display", FakeNullGdk)
-        context = self.sync_menu._get_launch_context(time.time())
-        self.assertEqual(context, None)
-
-    def test_open_control_panel_by_command_line(self):
-        """Check that the proper action is executed."""
-        appinfo = FakeAppInfo()
-        self.patch(linux.Gio, "AppInfo", appinfo)
-        timestamp = time.time()
-        self.sync_menu._open_control_panel_by_command_line(timestamp)
-
-        self.assertEqual(appinfo.command_line, linux.CLIENT_COMMAND_LINE)
-        self.assertEqual(appinfo.context.timestamp, timestamp)
-
-    def test_open_control_panel_by_command_line_with_arg(self):
-        """Check that the proper action is executed."""
-        appinfo = FakeAppInfo()
-        self.patch(linux.Gio, "AppInfo", appinfo)
-        timestamp = time.time()
-        arg = "--test-arg"
-        self.sync_menu._open_control_panel_by_command_line(timestamp, arg)
-
-        self.assertEqual(
-            appinfo.command_line, "%s %s" % (linux.CLIENT_COMMAND_LINE, arg))
-        self.assertEqual(appinfo.context.timestamp, timestamp)
-
-    def test_open_uri(self):
-        """Check that the proper action is executed."""
-        appinfo = FakeAppInfo()
-        self.patch(linux.Gio, "AppInfo", appinfo)
-        timestamp = time.time()
-
-        self.sync_menu._open_uri(linux.UBUNTUONE_LINK, timestamp)
-        self.assertEqual(appinfo.opened_uri, linux.UBUNTUONE_LINK)
-        self.assertEqual(appinfo.context.timestamp, timestamp)
-
-    def test_open_u1(self):
-        """Check that the proper action is executed."""
-        appinfo = FakeDesktopAppInfo()
-        timestamp = time.time()
-        self.patch(linux.Gio, "DesktopAppInfo", appinfo)
-
-        self.sync_menu.open_control_panel(timestamp=timestamp)
-        self.assertEqual(appinfo.desktop_id, linux.CLIENT_DESKTOP_ID)
-        self.assertTrue(appinfo.launched)
-        self.assertEqual(appinfo.files, [])
-        self.assertEqual(appinfo.context.timestamp, timestamp)
-
-    def test_open_share_tab(self):
-        """Check that the proper action is executed."""
-        timestamp = time.time()
-        data = []
-
-        self.patch(
-            self.sync_menu, "_open_control_panel_by_command_line",
-            lambda t, a: data.append((t, a)))
-        self.sync_menu.open_share_file_tab(timestamp=timestamp)
-        self.assertEqual(data, [(timestamp, "--switch-to share_links")])
-
-    def test_go_to_web(self):
-        """Check that the proper action is executed."""
-        timestamp = time.time()
-        data = []
-
-        self.patch(
-            self.sync_menu, "_open_uri", lambda u, t: data.append((t, u)))
-        self.sync_menu.open_go_to_web(timestamp=timestamp)
-        self.assertEqual(data, [(timestamp, linux.DASHBOARD)])
-
-    def test_open_ubuntu_one_folder(self):
-        """Check that the proper action is executed."""
-        timestamp = time.time()
-        data = []
-
-        self.patch(
-            self.sync_menu, "_open_uri", lambda u, t: data.append((t, u)))
-        self.sync_menu.open_ubuntu_one_folder(timestamp=timestamp)
-        self.assertEqual(
-            data,
-            [(timestamp, "file://" + self.syncdaemon_service.fake_root_path)])
-
-    def test_get_help(self):
-        """Check that the proper action is executed."""
-        timestamp = time.time()
-        data = []
-
-        self.patch(
-            self.sync_menu, "_open_uri", lambda u, t: data.append((t, u)))
-        self.sync_menu.open_web_help(timestamp=timestamp)
-        self.assertEqual(data, [(timestamp, linux.HELP_LINK)])
-
-    def test_more_storage(self):
-        """Check that the proper action is executed."""
-        timestamp = time.time()
-        data = []
-
-        self.patch(
-            self.sync_menu, "_open_uri", lambda u, t: data.append((t, u)))
-        self.sync_menu.open_get_more_storage(timestamp=timestamp)
-        self.assertEqual(data, [(timestamp, linux.GET_STORAGE_LINK)])
-
-    def test_empty_transfers(self):
-        """Check that the Transfers menu is empty."""
-        self.assertEqual(self.sync_menu.transfers.get_children(), [])
-
-    def test_only_recent(self):
-        """Check that only recent transfers items are loaded."""
-        data = ['file1', 'file2', 'file3']
-        self.status_frontend.recent_transfers_data = data
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 4)
-        data.reverse()
-        for itemM, itemD in zip(children, data):
-            self.assertEqual(
-                itemM.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD)
-
-    def test_only_progress(self):
-        """Check that only progress items are loaded."""
-        data = [
-            ('file1', 3000, 400),
-            ('file2', 2000, 100),
-            ('file3', 5000, 4600)]
-        uploading_data = {}
-        for filename, size, written in data:
-            uploading_data[filename] = (size, written)
-        self.status_frontend.uploading_data = data
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 4)
-        data.reverse()
-        for item in children:
-            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
-            if text is None:
-                continue
-            self.assertIn(text, uploading_data)
-            size, written = uploading_data[text]
-            percentage = written * 100 / size
-            self.assertEqual(item.property_get_int(
-                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
-                percentage)
-
-    def test_full_transfers(self):
-        """Check that the transfers menu contains the maximum transfers."""
-        # The api of recent transfers always returns a maximum of 5 items
-        data_recent = ['file1', 'file2', 'file3', 'file4', 'file5']
-        self.status_frontend.recent_transfers_data = \
-            data_recent
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 6)
-        data_recent.reverse()
-        for itemM, itemD in zip(children, data_recent):
-            self.assertEqual(itemM.property_get(
-                linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD)
-
-        data_current = [
-            ('file0', 1200, 600),
-            ('file1', 3000, 400),
-            ('file2', 2000, 100),
-            ('file3', 2500, 150),
-            ('file4', 1000, 600),
-            ('file5', 5000, 4600)]
-        uploading_data = {}
-        for filename, size, written in data_current:
-            uploading_data[filename] = (size, written)
-        self.status_frontend.uploading_data = data_current
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 11)
-        data_current.reverse()
-        for item in children[6:]:
-            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
-            self.assertIn(text, uploading_data)
-            size, written = uploading_data[text]
-            percentage = written * 100 / size
-            self.assertEqual(item.property_get_int(
-                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
-                percentage)
-
-    def test_mnemonics_labels(self):
-        """Check that the transfers menu sanitizes the underscores."""
-        data_recent = ['file_1', 'file__2']
-        self.status_frontend.recent_transfers_data = \
-            data_recent
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        data_recent.reverse()
-        for itemM, itemD in zip(children, data_recent):
-            self.assertEqual(itemM.property_get(
-                linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD.replace('_', '__'))
-
-    def test_update_transfers(self):
-        """Check that everything is ok when updating the transfers value."""
-        data_current = [
-            ('file0', 1200, 600),
-            ('file1', 3000, 400),
-            ('file4', 1000, 600),
-            ('file5', 5000, 4600)]
-        uploading_data = {}
-        for filename, size, written in data_current:
-            uploading_data[filename] = (size, written)
-        self.status_frontend.uploading_data = data_current
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 5)
-        data_current.reverse()
-        for item in children:
-            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
-            if text is None:
-                continue
-            self.assertIn(text, uploading_data)
-            size, written = uploading_data[text]
-            percentage = written * 100 / size
-            self.assertEqual(item.property_get_int(
-                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
-                percentage)
-
-        data_recent = ['file5']
-        self.status_frontend.recent_transfers_data = data_recent
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 6)
-        data_recent.reverse()
-        for itemM, itemD in zip(children, data_recent):
-            self.assertEqual(itemM.property_get(
-                linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD)
-
-        data_current = [
-            ('file0', 1200, 700),
-            ('file1', 3000, 600),
-            ('file4', 1000, 800)]
-        uploading_data = {}
-        for filename, size, written in data_current:
-            uploading_data[filename] = (size, written)
-        self.status_frontend.uploading_data = data_current
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 5)
-        data_current.reverse()
-        for item in children[6:]:
-            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
-            self.assertIn(text, uploading_data)
-            size, written = uploading_data[text]
-            percentage = written * 100 / size
-            self.assertEqual(item.property_get_int(
-                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
-                percentage)
-
-    def test_transfers_order(self):
-        """Check that the proper transfers are shown first."""
-        data_current = [
-            ('file0', 1200, 610),
-            ('file1', 3000, 400),
-            ('file2', 2000, 100),
-            ('file3', 2500, 150),
-            ('file4', 2500, 950),
-            ('file5', 3500, 550),
-            ('file6', 1000, 600),
-            ('file7', 5000, 4600)]
-        expected = [
-            ('file7', 5000, 4600),
-            ('file4', 2500, 950),
-            ('file0', 1200, 610),
-            ('file6', 1000, 600),
-            ('file5', 3500, 550)]
-        self.status_frontend.uploading_data = data_current
-        self.sync_menu.transfers.update_progress()
-        children = self.sync_menu.transfers.get_children()
-        # The menu should only show 5 current transfers and a separator item.
-        self.assertEqual(len(children), 6)
-        i = 0
-        for item in children:
-            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
-            if text is None:
-                continue
-            percentage = item.property_get_int(
-                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE)
-            name, size, written = expected[i]
-            i += 1
-            percentage_expected = written * 100 / size
-            self.assertEqual(text, name)
-            self.assertEqual(percentage, percentage_expected)
-
-    def test_update_transfers_delay(self):
-        """Check that the timer is being handle properly."""
-        self.sync_menu.next_update = time.time()
-        self.sync_menu.update_transfers()
-        self.sync_menu.timer = None
-        self.sync_menu.next_update = time.time() * 2
-        self.sync_menu.update_transfers()
-        self.assertEqual(self.sync_menu.timer.delay, 3)
-
-    def test_status_change_from_menu(self):
-        """Check the behavior when the status is changed from the menu."""
-        self.sync_menu.change_sync_status()
-        self.assertFalse(self.sync_menu._connected)
-        self.assertFalse(self.sync_menu._ignore_status_event)
-        self.assertFalse(self.sync_menu._syncdaemon_service.connect_called)
-        self.assertTrue(self.sync_menu._syncdaemon_service.disconnect_called)
-
-        self.sync_menu._syncdaemon_service.disconnect_called = False
-        self.sync_menu.change_sync_status()
-        self.assertTrue(self.sync_menu._connected)
-        self.assertFalse(self.sync_menu._ignore_status_event)
-        self.assertTrue(self.sync_menu._syncdaemon_service.connect_called)
-        self.assertFalse(self.sync_menu._syncdaemon_service.disconnect_called)
-
-    def test_ignore_status(self):
-        """Check that neither connect or disconnect are called."""
-        self.sync_menu._ignore_status_event = True
-        self.assertTrue(self.sync_menu._ignore_status_event)
-        self.sync_menu.change_sync_status()
-        self.assertTrue(self.sync_menu._connected)
-        self.assertFalse(self.sync_menu._ignore_status_event)
-        self.assertFalse(self.sync_menu._syncdaemon_service.connect_called)
-        self.assertFalse(self.sync_menu._syncdaemon_service.disconnect_called)
-
-    def test_sync_status_changed(self):
-        """Check sync_status_changed behavior."""
-        self.sync_menu.sync_status_changed(True)
-        self.assertNotIn('paused', self.sync_menu.app.data)
-        self.sync_menu.sync_status_changed(False)
-        self.assertFalse(self.sync_menu._connected)
-        self.assertTrue(self.sync_menu._ignore_status_event)
-        self.assertTrue(self.sync_menu.app.data['paused'])
 
=== modified file 'ubuntuone/platform/tests/test_tools.py'
--- ubuntuone/platform/tests/test_tools.py	2016-09-17 01:06:23 +0000
+++ ubuntuone/platform/tests/test_tools.py	2018-04-24 23:14:39 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -44,8 +45,6 @@
     interaction_interfaces,
     states,
     volume_manager,
-    RECENT_TRANSFERS,
-    UPLOADING,
 )
 from ubuntuone.platform import tools
 from ubuntuone.platform.tests import IPCTestCase
@@ -253,13 +252,6 @@
         self.assertEqual('share_id', result['volume_id'])
         self.assertEqual(False, self.main.vm.shares['share_id'].accepted)
 
-    @defer.inlineCallbacks
-    def test_sync_menu(self):
-        """Test accept_share method."""
-        result = yield self.tool.sync_menu()
-        self.assertIn(RECENT_TRANSFERS, result)
-        self.assertIn(UPLOADING, result)
-
 
 class TestWaitForSignals(TestToolsBase):
     """Test case for the wait_for_signals method from SyncDaemonTool."""
@@ -496,8 +488,8 @@
         """Test SyncDaemonTool.waiting_metadata."""
         # inject the fake data
         self.action_q.queue.waiting.extend([
-                FakeCommand("node_a_foo", "node_a_bar", path='path'),
-                FakeCommand("node_b_foo", "node_b_bar")])
+            FakeCommand("node_a_foo", "node_a_bar", path='path'),
+            FakeCommand("node_b_foo", "node_b_bar")])
         result = yield self.tool.waiting_metadata()
 
         self.assertEqual(2, len(result))
@@ -521,8 +513,8 @@
 
         # inject the fake data
         self.action_q.queue.waiting.extend([
-                FakeContentCommand("", "node_id", path='/some/path'),
-                FakeContentCommand("", "node_id_1", path='/other/path')])
+            FakeContentCommand("", "node_id", path='/some/path'),
+            FakeContentCommand("", "node_id_1", path='/other/path')])
 
         result = yield self.tool.waiting_content()
 
 
=== modified file 'ubuntuone/platform/tools/__init__.py'
--- ubuntuone/platform/tools/__init__.py	2018-03-08 19:39:13 +0000
+++ ubuntuone/platform/tools/__init__.py	2018-04-24 23:14:39 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -269,13 +270,6 @@
 
     @defer.inlineCallbacks
     @log_call(logger.debug)
-    def sync_menu(self):
-        """Return a deferred that will be fired with the sync menu data."""
-        results = yield self.proxy.call_method('status', 'sync_menu')
-        defer.returnValue(results)
-
-    @defer.inlineCallbacks
-    @log_call(logger.debug)
     def accept_share(self, share_id):
         """Accept the share with id: share_id."""
         d = self.wait_for_signals(
 
=== modified file 'ubuntuone/syncdaemon/__init__.py'
--- ubuntuone/syncdaemon/__init__.py	2016-05-30 13:03:37 +0000
+++ ubuntuone/syncdaemon/__init__.py	2018-04-24 23:14:39 +0000
@@ -1,5 +1,5 @@
 # Copyright 2009-2012 Canonical Ltd.
-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -31,9 +31,3 @@
 REQUIRED_CAPS = frozenset(
     ["no-content", "account-info", "resumable-uploads", "fix462230", "volumes",
      "generations"])
-
-
-# Sync Menu data constants
-RECENT_TRANSFERS = 'recent-transfers'
-UPLOADING = 'uploading'
-DOWNLOADING = 'downloading'
 
=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2018-04-14 23:34:20 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2018-04-24 23:14:39 +0000
@@ -304,10 +304,6 @@
                 waiting_content.append(data)
         return waiting_content
 
-    def sync_menu(self):
-        """Return the info necessary to construct the menu."""
-        return self.main.status_listener.menu_data()
-
 
 class SyncdaemonFileSystem(SyncdaemonObject):
     """An interface to the FileSystem Manager."""