Indicator Location

Merge lp:~charlesk/indicator-location/lp-1535353-remove-here-tos into lp:indicator-location/16.04

lp-1535353-remove-here-tos
Merge into trunk.16.04

Proposed by Charles Kerr on 2016-01-21

Status:

Merged

Approved by:

Xavi Garcia on 2016-01-29

Approved revision:

151

Merged at revision:

151

Proposed branch:

lp:~charlesk/indicator-location/lp-1535353-remove-here-tos

Merge into:

lp:indicator-location/16.04

Diff against target:

655 lines (+8/-466)

12 files modified

src/CMakeLists.txt (+0/-2)
src/accounts-service-license-controller.cc (+0/-168)
src/accounts-service-license-controller.h (+0/-52)
src/license-controller.cc (+0/-50)
src/license-controller.h (+0/-75)
src/main.cc (+1/-3)
src/mock-license-controller.h (+0/-46)
src/phone.cc (+2/-57)
src/phone.h (+1/-6)
src/service.cc (+2/-2)
src/service.h (+1/-2)
tests/phone-test.cc (+1/-3)

To merge this branch:

bzr merge lp:~charlesk/indicator-location/lp-1535353-remove-here-tos

Related bugs:

Bug #1507793: Selecting "View terms and conditions HERE" opens browser with error message	High	Fix Released
Bug #1535353: Location menu contains "View HERE terms and conditions"	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Xavi Garcia		2016-01-21	Approve on 2016-01-29
Matthew Paul Thomas (community)	design		Approve on 2016-01-22
PS Jenkins bot (community)	continuous-integration		Approve on 2016-01-21
Review via email: mp+283509@code.launchpad.net

Commit message

Remove the "View HERE terms and conditions" menuitem

Description of the change

Remove the "View HERE terms and conditions" menuitem

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-21:

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/3/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Matthew Paul Thomas (mpt) wrote on 2016-01-22:

That sweet, sweet smell of menu simplification ... and code removal, of course.

review: Approve (design)

Revision history for this message

Xavi Garcia (xavi-garcia-mena) wrote on 2016-01-29:

Looks good to me, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Charles Kerr

Indicator Applet Developers

 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2015-07-15 18:54:31 +0000
 +++ src/CMakeLists.txt	2016-01-21 16:59:41 +0000
@@ -18,8 +18,6 @@
    phone.cc
    service.cc
    location-service-controller.cc
--  accounts-service-license-controller.cc
--  license-controller.cc
+ )
  include_directories (${CMAKE_SOURCE_DIR})
  link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 === removed file 'src/accounts-service-license-controller.cc'
 --- src/accounts-service-license-controller.cc	2014-09-02 17:33:44 +0000
 +++ src/accounts-service-license-controller.cc	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *   Pete Woods <pete.woods@canonical.com>
-- */
--
--#include "accounts-service-license-controller.h"
--#include "utils.h"
--
--#define ACCOUNTS_NAME "org.freedesktop.Accounts"
--#define ACCOUNTS_SERVICE "com.ubuntu.location.providers.here.AccountsService"
--
--namespace
--{
--
--std::string
--user_path()
--{
--  return "/org/freedesktop/Accounts/User" + std::to_string(getuid());
--}
--
--std::string
--make_path(const std::string& path, const std::string& lang)
--{
--  return path + "/" + lang + ".html";
--}
--
--std::string
--build_full_path(const std::string & path)
--{
--  std::string result;
--  char * lang_char = getenv("LANG");
--  if (lang_char)
--  {
--    std::string lang = lang_char;
--    auto pos = lang.find('.');
--    if (pos != std::string::npos)
--    {
--      lang = lang.substr(0, pos);
--    }
--    result = make_path(path, lang);
--  }
--
--  if (!g_file_test(result.c_str(), G_FILE_TEST_EXISTS))
--  {
--    result = make_path(path, "en_US");
--  }
--
--  return std::string("file://") + result;
--}
--
--}
--
--AccountsServiceLicenseController::AccountsServiceLicenseController()
--{
--  GError * error = nullptr;
--  proxy.reset(
--      g_dbus_proxy_new_for_bus_sync(
--          G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
--          nullptr, ACCOUNTS_NAME, user_path().c_str(),
--          ACCOUNTS_SERVICE,
--          nullptr, &error),
--          GObjectDeleter());
--
--  if (proxy.get() == nullptr)
--  {
--    g_warning("Could not get AccountsService proxy '%s'", error->message);
--    g_error_free(error);
--    return;
--  }
--
--  g_signal_connect(proxy.get(), "g-properties-changed",
--                   G_CALLBACK (on_properties_changed),
--                   static_cast<void*>(this));
--}
--
--bool
--AccountsServiceLicenseController::license_accepted() const
--{
--  bool result = false;
--
--  GVariant * accepted_variant = g_dbus_proxy_get_cached_property(
--      proxy.get(), "LicenseAccepted");
--  if (accepted_variant)
--  {
--    result = g_variant_get_boolean(accepted_variant);
--    g_variant_unref(accepted_variant);
--  }
--
--  return result;
--}
--
--std::string
--AccountsServiceLicenseController::license_path() const
--{
--  std::string path;
--
--  GVariant * base_path_variant = g_dbus_proxy_get_cached_property(
--      proxy.get(), "LicenseBasePath");
--  if (base_path_variant)
--  {
--    const char * temp = g_variant_get_string(base_path_variant, NULL);
--    if (temp)
--    {
--      path = temp;
--    }
--    g_variant_unref(base_path_variant);
--  }
--
--  return build_full_path(path);
--}
--
--void
--AccountsServiceLicenseController::on_properties_changed(
--    GDBusProxy *proxy, GVariant *changed_properties,
--    const gchar* const *invalidated_properties, gpointer user_data)
--{
--  AccountsServiceLicenseController * self =
--      static_cast<AccountsServiceLicenseController *>(user_data);
--
--  if (g_variant_n_children(changed_properties) > 0)
--  {
--    GVariantIter *iter;
--    const gchar *key;
--    GVariant *value;
--    std::string property_name;
--
--    g_variant_get(changed_properties, "a{sv}", &iter);
--    while (g_variant_iter_loop(iter, "{&sv}", &key, &value))
--    {
--      if (!key)
--      {
--        continue;
--      }
--
--      property_name = key;
--
--      if (property_name == "LicenseAccepted")
--      {
--        self->notify_license_accepted(g_variant_get_boolean(value));
--      }
--      else if (property_name == "LicenseBasePath")
--      {
--        const gchar * temp = g_variant_get_string(value, NULL);
--        std::string path;
--        if (temp)
--        {
--          path = temp;
--        }
--        self->notify_license_path(build_full_path(path));
--      }
--    }
--    g_variant_iter_free(iter);
--  }
--}
 === removed file 'src/accounts-service-license-controller.h'
 --- src/accounts-service-license-controller.h	2014-09-02 16:34:36 +0000
 +++ src/accounts-service-license-controller.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *   Pete Woods <pete.woods@canonical.com>
-- */
--
--#ifndef __INDICATOR_LOCATION_ACCOUNTS_SERVICE_LICENSE_CONTROLLER__H__
--#define __INDICATOR_LOCATION_ACCOUNTS_SERVICE_LICENSE_CONTROLLER__H__
--
--#include "license-controller.h"
--
--#include <gio/gio.h>
--#include <memory>
--
--class AccountsServiceLicenseController : public LicenseController
--{
--public:
--  AccountsServiceLicenseController();
--
--  ~AccountsServiceLicenseController()
--  {
--  }
--
--  bool
--  license_accepted() const override;
--
--  std::string
--  license_path() const override;
--
--private:
--  std::shared_ptr<GDBusProxy> proxy;
--
--  static void
--  on_properties_changed(GDBusProxy *proxy, GVariant *changed_properties,
--                        const gchar* const *invalidated_properties,
--                        gpointer user_data);
--};
--
--#endif // __INDICATOR_LOCATION_ACCOUNTS_SERVICE_LICENSE_CONTROLLER__H__
 === removed file 'src/license-controller.cc'
 --- src/license-controller.cc	2014-09-02 16:34:36 +0000
 +++ src/license-controller.cc	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *   Pete Woods <pete.woods@canonical.com>
-- */
--
--#include "license-controller.h"
--
--void
--LicenseController::add_listener(LicenseControllerListener * const l)
--{
--  listeners.insert(l);
--}
--
--void
--LicenseController::remove_listener(LicenseControllerListener * const l)
--{
--  listeners.erase(l);
--}
--
--void
--LicenseController::notify_license_accepted(bool license_accepted)
--{
--  for (auto it : listeners)
--  {
--    it->on_license_accepted_changed(license_accepted);
--  }
--}
--
--void
--LicenseController::notify_license_path(const std::string & license_path)
--{
--  for (auto it : listeners)
--  {
--    it->on_license_path_changed(license_path);
--  }
--}
 === removed file 'src/license-controller.h'
 --- src/license-controller.h	2014-09-02 16:34:36 +0000
 +++ src/license-controller.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *   Pete Woods <pete.woods@canonical.com>
-- */
--
--#ifndef __INDICATOR_LOCATION_LICENSE_CONTROLLER__H__
--#define __INDICATOR_LOCATION_LICENSE_CONTROLLER__H__
--
--#include <memory>
--#include <string>
--#include <unordered_set>
--
--class LicenseControllerListener
--{
--public:
--  LicenseControllerListener() = default;
--
--  virtual
--  ~LicenseControllerListener() = default;
--
--public:
--  virtual void
--  on_license_accepted_changed(bool license_accepted) = 0;
--
--  virtual void
--  on_license_path_changed(const std::string & license_path) = 0;
--};
--
--class LicenseController
--{
--public:
--  LicenseController() = default;
--
--  virtual
--  ~LicenseController() = default;
--
--  virtual bool
--  license_accepted() const = 0;
--
--  virtual std::string
--  license_path() const = 0;
--
--  void
--  add_listener(LicenseControllerListener * const);
--
--  void
--  remove_listener(LicenseControllerListener * const);
--
--protected:
--
--  void
--  notify_license_accepted(bool);
--
--  void
--  notify_license_path(const std::string & license_path);
--
--private:
--  std::unordered_set<LicenseControllerListener *> listeners;
--};
--
--#endif // __INDICATOR_LOCATION_LICENSE_CONTROLLER__H__
 === modified file 'src/main.cc'
 --- src/main.cc	2015-04-16 01:54:48 +0000
 +++ src/main.cc	2016-01-21 16:59:41 +0000
@@ -21,7 +21,6 @@
  #include <glib/gi18n.h>
  #include <glib.h>
--#include "accounts-service-license-controller.h"
  #include "location-service-controller.h"
  #include "service.h"
@@ -44,8 +43,7 @@
    /* set up the service */
    loop = g_main_loop_new (nullptr, false);
    auto controller = std::make_shared<LocationServiceController>();
--  auto license_controller = std::make_shared<AccountsServiceLicenseController>();
--  Service service (controller, license_controller);
++  Service service (controller);
    service.set_name_lost_callback (on_name_lost, loop);
    g_main_loop_run (loop);
 === removed file 'src/mock-license-controller.h'
 --- src/mock-license-controller.h	2014-09-02 16:34:36 +0000
 +++ src/mock-license-controller.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *   Pete Woods <pete.woods@canonical.com>
-- */
--
--#ifndef __INDICATOR_LOCATION_MOCK_LICENSE_CONTROLLER__H__
--#define __INDICATOR_LOCATION_MOCK_LICENSE_CONTROLLER__H__
--
--#include "license-controller.h"
--
--class MockLicenseController : public LicenseController
--{
--public:
--  MockLicenseController() = default;
--
--  ~MockLicenseController()
--  {
--  }
--
--  bool
--  license_accepted() const override
--  {
--    return true;
--  }
--
--  std::string
--  license_path() const override{
--    return "file:///foo/bar/en_US.html";
--  }
--};
--
--#endif // __INDICATOR_LOCATION_MOCK_LICENSE_CONTROLLER__H__
 === modified file 'src/phone.cc'
 --- src/phone.cc	2015-11-27 11:07:17 +0000
 +++ src/phone.cc	2016-01-21 16:59:41 +0000
@@ -33,22 +33,18 @@
  #define GPS_ACTION_KEY "gps-detection-enabled"
  Phone :: Phone (const std::shared_ptr<Controller>& controller_,
--                const std::shared_ptr<LicenseController>& license_controller_,
                  const std::shared_ptr<GSimpleActionGroup>& action_group_):
    controller (controller_),
--  license_controller (license_controller_),
    action_group (action_group_)
+ {
    create_menu ();
    controller->add_listener (this);
--  license_controller->add_listener (this);
    /* create the actions & add them to the group */
--  std::array<GSimpleAction*, 5> actions = { create_root_action(),
++  std::array<GSimpleAction*, 4> actions = { create_root_action(),
                                              create_detection_enabled_action(),
                                              create_gps_enabled_action(),
--                                            create_settings_action(),
--                                            create_licence_action() };
++                                            create_settings_action() };
    for (auto a : actions)
+     {
        g_action_map_add_action (G_ACTION_MAP(action_group.get()), G_ACTION(a));
@@ -63,7 +59,6 @@
  Phone :: ~Phone ()
+ {
    controller->remove_listener (this);
--  license_controller->remove_listener (this);
+ }
  /***
@@ -158,17 +153,6 @@
+ }
  void
--Phone::on_license_accepted_changed(bool license_accepted)
--{
--  rebuild_submenu();
--}
--
--void
--Phone::on_license_path_changed(const std::string & license_path)
--{
--}
--
--void
  Phone :: on_detection_location_activated (GSimpleAction * action,
                                            GVariant      * parameter G_GNUC_UNUSED,
                                            gpointer        gself)
@@ -240,39 +224,6 @@
  ****
  ***/
--#define LICENCE_ACTION_KEY "licence"
--
--namespace
--{
--  void
--  on_licence_activated (GSimpleAction * simple      G_GNUC_UNUSED,
--                         GVariant      * parameter,
--                         gpointer        user_data   G_GNUC_UNUSED)
--  {
--    LicenseController * license_controller = static_cast<LicenseController *>(user_data);
--    std::string path = license_controller->license_path();
--    const gchar * urls[2] = {path.c_str(), nullptr};
--    ubuntu_app_launch_start_application("webbrowser-app", urls);
--  }
--}
--
--GSimpleAction *
--Phone :: create_licence_action ()
--{
--  GSimpleAction * action;
--
--  action = g_simple_action_new (LICENCE_ACTION_KEY, nullptr);
--
--  g_signal_connect(action, "activate", G_CALLBACK(on_licence_activated),
--                   static_cast<void *>(license_controller.get()));
--
--  return action;
--}
--
--/***
--****
--***/
--
  #define SETTINGS_ACTION_KEY "settings"
  namespace
@@ -349,11 +300,5 @@
    g_menu_append_item(submenu.get(), location);
    g_object_unref(location);
--  if (license_controller->license_accepted())
--  {
--    g_menu_append(submenu.get(), _("View HERE terms and conditions"),
--                  "indicator." LICENCE_ACTION_KEY);
--  }
--
    g_menu_append (submenu.get(), _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::security-privacy");
+ }
 === modified file 'src/phone.h'
 --- src/phone.h	2015-04-15 14:23:25 +0000
 +++ src/phone.h	2016-01-21 16:59:41 +0000
@@ -25,26 +25,21 @@
  #include <glib.h>
  #include <gio/gio.h>
--#include "license-controller.h"
  #include "controller.h"
--class Phone: public ControllerListener, public LicenseControllerListener
++class Phone: public ControllerListener
+ {
    public:
      Phone (const std::shared_ptr<Controller>& controller,
--           const std::shared_ptr<LicenseController>& license_controller,
             const std::shared_ptr<GSimpleActionGroup>& action_group);
      virtual ~Phone ();
      std::shared_ptr<GMenu> get_menu () { return menu; }
    protected:
      std::shared_ptr<Controller> controller;
--    std::shared_ptr<LicenseController> license_controller;
      virtual void on_is_valid_changed();
      virtual void on_gps_enabled_changed (bool is_enabled);
      virtual void on_location_service_enabled_changed (bool is_enabled);
--    void on_license_accepted_changed(bool license_accepted) override;
--    void on_license_path_changed(const std::string & license_path) override;
    private:
      std::shared_ptr<GMenu> menu;
 === modified file 'src/service.cc'
 --- src/service.cc	2014-10-03 16:48:12 +0000
 +++ src/service.cc	2016-01-21 16:59:41 +0000
@@ -27,9 +27,9 @@
  ***
  **/
--Service :: Service (const std::shared_ptr<Controller>& controller, const std::shared_ptr<LicenseController>& license_controller):
++Service :: Service (const std::shared_ptr<Controller>& controller):
    action_group (g_simple_action_group_new(), GObjectDeleter()),
--  phone_profile (controller, license_controller, action_group),
++  phone_profile (controller, action_group),
    name_lost_callback (nullptr),
    name_lost_user_data (0),
    action_group_export_id (0),
 === modified file 'src/service.h'
 --- src/service.h	2014-09-02 16:34:36 +0000
 +++ src/service.h	2016-01-21 16:59:41 +0000
@@ -23,7 +23,6 @@
  #include <memory>
  #include <set>
--#include "license-controller.h"
  #include "controller.h"
  #include "phone.h"
  #include "utils.h" // GObjectDeleter
@@ -31,7 +30,7 @@
  class Service
+ {
    public:
--    Service (const std::shared_ptr<Controller>& controller, const std::shared_ptr<LicenseController>& license_controller);
++    Service (const std::shared_ptr<Controller>& controller);
      virtual ~Service ();
    private:
 === modified file 'tests/phone-test.cc'
 --- tests/phone-test.cc	2015-11-20 15:44:19 +0000
 +++ tests/phone-test.cc	2016-01-21 16:59:41 +0000
@@ -22,7 +22,6 @@
  #include "gtest-dbus-indicator-fixture.h"
  #include "src/dbus-shared.h"
--#include "src/mock-license-controller.h"
  #include "src/controller-mock.h"
  #include "src/service.h"
@@ -74,7 +73,7 @@
+     {
        myController.reset (new MockController ());
        myController->add_listener (this);
--      myService.reset (new Service (myController, std::make_shared<MockLicenseController>()));
++      myService.reset (new Service (myController));
+     }
      virtual void teardown_service ()
@@ -91,7 +90,6 @@
    ASSERT_TRUE (action_exists ("location-detection-enabled"));
    ASSERT_TRUE (action_exists ("phone-header"));
    ASSERT_TRUE (action_exists ("settings"));
--  ASSERT_TRUE (action_exists ("licence"));
+ }
  TEST_F (PhoneTest, MenuitemsExist)