Merge lp:~pete-woods/indicator-location/here-licence into lp:indicator-location/14.10

[Pete Woods]

Add here licence action (new dependency on libUAL)

Add here licence action (new dependency on libUAL)

[lp:~pete-woods/indicator-location/here-licence]

119. By Pete Woods on 2014-09-01

Update translations file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

120. By Pete Woods on 2014-09-01

Whoops!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

121. By Pete Woods on 2014-09-01

This returns variants

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

122. By Pete Woods on 2014-09-01

It's a tuple of variants

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

123. By Pete Woods on 2014-09-01

This might actually work now..

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

124. By Pete Woods on 2014-09-02

Build a URI from the provided path

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

125. By Pete Woods on 2014-09-02

Add license controller and associated listeners

126. By Pete Woods on 2014-09-02

Use libUAL to launch the web browser

127. By Pete Woods on 2014-09-02

Check the correct path

128. By Pete Woods on 2014-09-02

Unncessary import

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

129. By Pete Woods on 2014-09-02

Minimise diff

130. By Pete Woods on 2014-09-02

Respond to charles' review comments

131. By Pete Woods on 2014-09-02

Null pointer paranoia

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:129
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

132. By Pete Woods on 2014-09-02

Rebuild the submenu when the license accept state changes

133. By Pete Woods on 2014-09-02

Use GObjectDeleter

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:131
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/19/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Thanks Pete!

review: Approve

[lp:~pete-woods/indicator-location/here-licence]

134. By Pete Woods on 2014-09-02

Line numbers changed again

135. By Pete Woods on 2014-09-02

Don't hang onto a reference to a temporary

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~pete-woods/indicator-location/here-licence]

136. By Pete Woods on 2014-09-02

Didn't null-terminate the list

137. By Pete Woods on 2014-09-02

Update line numbers

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-27 15:34:07 +0000
+++ CMakeLists.txt	2014-09-02 18:21:47 +0000
@@ -33,6 +33,7 @@
 include (FindPkgConfig)
 pkg_check_modules (SERVICE_DEPS REQUIRED
                    ubuntu-platform-api>=1.0.0
+                   ubuntu-app-launch-2
                    url-dispatcher-1
                    gio-unix-2.0>=2.36
                    glib-2.0>=2.36)

=== modified file 'debian/control'
--- debian/control	2014-08-19 14:50:32 +0000
+++ debian/control	2014-09-02 18:21:47 +0000
@@ -11,6 +11,7 @@
                intltool (>= 0.35.0), 
                libglib2.0-dev (>= 2.36),
                libgtest-dev,
+               libubuntu-app-launch2-dev,
                liburl-dispatcher1-dev,
                libubuntu-application-api-dev,
                python,

=== modified file 'po/indicator-location.pot'
--- po/indicator-location.pot	2014-08-09 23:23:01 +0000
+++ po/indicator-location.pot	2014-09-02 18:21:47 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Canonical Ltd.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: indicator-location\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-09 18:22-0500\n"
+"POT-Creation-Date: 2014-09-02 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,15 +17,18 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:77
-#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:80
+#: src/phone.cc:83 src/phone.cc:86
 msgid "Location"
 msgstr ""
 
-#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:260
+#: src/phone.cc:327
 msgid "Location detection"
 msgstr ""
 
-#: /home/charles/canonical/src/indicator-location/lp-1354058-use-standard-translations-cmake-file/po/../src//phone.cc:265
+#: src/phone.cc:336
+msgid "View HERE terms and conditions"
+msgstr ""
+
+#: src/phone.cc:340
 msgid "GPS"
 msgstr ""

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-05-27 15:34:07 +0000
+++ src/CMakeLists.txt	2014-09-02 18:21:47 +0000
@@ -13,7 +13,14 @@
 ###  it's built apart from main() as a convenience for tests/
 ###
 
-add_library (${SERVICE_LIB} STATIC controller.cc phone.cc service.cc controller-ualc.cc)
+add_library (${SERVICE_LIB} STATIC
+  controller.cc
+  phone.cc
+  service.cc
+  controller-ualc.cc
+  accounts-service-license-controller.cc
+  license-controller.cc
+)
 include_directories (${CMAKE_SOURCE_DIR})
 link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 

=== added file 'src/accounts-service-license-controller.cc'
--- src/accounts-service-license-controller.cc	1970-01-01 00:00:00 +0000
+++ src/accounts-service-license-controller.cc	2014-09-02 18:21:47 +0000
@@ -0,0 +1,168 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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);
+  }
+}

=== added file 'src/accounts-service-license-controller.h'
--- src/accounts-service-license-controller.h	1970-01-01 00:00:00 +0000
+++ src/accounts-service-license-controller.h	2014-09-02 18:21:47 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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__

=== added file 'src/license-controller.cc'
--- src/license-controller.cc	1970-01-01 00:00:00 +0000
+++ src/license-controller.cc	2014-09-02 18:21:47 +0000
@@ -0,0 +1,50 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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);
+  }
+}

=== added file 'src/license-controller.h'
--- src/license-controller.h	1970-01-01 00:00:00 +0000
+++ src/license-controller.h	2014-09-02 18:21:47 +0000
@@ -0,0 +1,75 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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	2013-08-29 17:48:37 +0000
+++ src/main.cc	2014-09-02 18:21:47 +0000
@@ -21,6 +21,7 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 
+#include "accounts-service-license-controller.h"
 #include "controller-ualc.h"
 #include "service.h"
 
@@ -43,7 +44,8 @@
   /* set up the service */
   loop = g_main_loop_new (nullptr, false);
   std::shared_ptr<Controller> controller (new UbuntuAppLocController ());
-  Service service (controller);
+  auto license_controller = std::make_shared<AccountsServiceLicenseController>();
+  Service service (controller, license_controller);
   service.set_name_lost_callback (on_name_lost, loop);
   g_main_loop_run (loop);
 

=== added file 'src/mock-license-controller.h'
--- src/mock-license-controller.h	1970-01-01 00:00:00 +0000
+++ src/mock-license-controller.h	2014-09-02 18:21:47 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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	2013-11-08 17:28:46 +0000
+++ src/phone.cc	2014-09-02 18:21:47 +0000
@@ -22,6 +22,7 @@
 #include <glib/gi18n.h>
 
 #include <url-dispatcher.h>
+#include <ubuntu-app-launch.h>
 
 #include "phone.h"
 #include "utils.h" // GObjectDeleter
@@ -29,18 +30,22 @@
 #define PROFILE_NAME "phone"
 
 Phone :: Phone (const std::shared_ptr<Controller>& controller_,
+                const std::shared_ptr<LicenseController>& license_controller_,
                 const std::shared_ptr<GSimpleActionGroup>& action_group_):
   controller (controller_),
-  menu (create_menu ()),
+  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*, 4> actions = { create_root_action(),
+  std::array<GSimpleAction*, 5> actions = { create_root_action(),
                                             create_detection_enabled_action(),
                                             create_gps_enabled_action(),
-                                            create_settings_action() };
+                                            create_settings_action(),
+                                            create_licence_action() };
   for (auto a : actions)
     {
       g_action_map_add_action (G_ACTION_MAP(action_group.get()), G_ACTION(a));
@@ -51,6 +56,7 @@
 Phone :: ~Phone ()
 {
   controller->remove_listener (this);
+  license_controller->remove_listener (this);
 }
 
 /***
@@ -126,6 +132,17 @@
 }
 
 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)
@@ -198,6 +215,38 @@
   return action;
 }
 
+/***
+****
+***/
+
+#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;
+}
 
 /***
 ****
@@ -245,27 +294,16 @@
 ****
 ***/
 
-std::shared_ptr <GMenu>
+void
 Phone :: create_menu ()
 {
-  GMenu * menu;
-  GMenu * submenu;
   GMenuItem * header;
-  GMenuItem * location;
-  GMenuItem * gps;
 
   /* create the submenu */
-  submenu = g_menu_new ();
-
-  location = g_menu_item_new (_("Location detection"), "indicator." LOCATION_ACTION_KEY);
-  g_menu_item_set_attribute (location, "x-canonical-type", "s", "com.canonical.indicator.switch");
-  g_menu_append_item (submenu, location);
-  g_object_unref (location);
-
-  gps = g_menu_item_new (_("GPS"), "indicator." GPS_ACTION_KEY);
-  g_menu_item_set_attribute (gps, "x-canonical-type", "s", "com.canonical.indicator.switch");
-  g_menu_append_item (submenu, gps);
-  g_object_unref (gps);
+  submenu.reset(g_menu_new (), GObjectDeleter());
+
+  /* populate the submenu */
+  rebuild_submenu();
 
   // disabled for 13.04 -- the location settings panel isn't complete
   // g_menu_append (submenu, _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");
@@ -273,13 +311,35 @@
   /* add the submenu to a new header */
   header = g_menu_item_new (nullptr, "indicator." HEADER_ACTION_KEY);
   g_menu_item_set_attribute (header, "x-canonical-type", "s", "com.canonical.indicator.root");
-  g_menu_item_set_submenu (header, G_MENU_MODEL (submenu));
-  g_object_unref (submenu);
+  g_menu_item_set_submenu (header, G_MENU_MODEL (submenu.get()));
 
   /* add the header to a new menu */
-  menu = g_menu_new ();
-  g_menu_append_item (menu, header);
+  menu.reset(g_menu_new (), GObjectDeleter());
+  g_menu_append_item (menu.get(), header);
   g_object_unref (header);
-
-  return std::shared_ptr<GMenu>(menu, GObjectDeleter());
+}
+
+void
+Phone::rebuild_submenu()
+{
+  g_menu_remove_all(submenu.get());
+
+  GMenuItem * location = g_menu_item_new(_("Location detection"),
+                                         "indicator." LOCATION_ACTION_KEY);
+  g_menu_item_set_attribute(location, "x-canonical-type", "s",
+                            "com.canonical.indicator.switch");
+  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);
+  }
+
+  GMenuItem * gps = g_menu_item_new(_("GPS"), "indicator." GPS_ACTION_KEY);
+  g_menu_item_set_attribute(gps, "x-canonical-type", "s",
+                            "com.canonical.indicator.switch");
+  g_menu_append_item(submenu.get(), gps);
+  g_object_unref(gps);
 }

=== modified file 'src/phone.h'
--- src/phone.h	2013-10-31 18:54:01 +0000
+++ src/phone.h	2014-09-02 18:21:47 +0000
@@ -25,27 +25,34 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#include "license-controller.h"
 #include "controller.h"
 
-class Phone: public ControllerListener
+class Phone: public ControllerListener, public LicenseControllerListener
 {
   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_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;
+    std::shared_ptr<GMenu> submenu;
     std::shared_ptr<GSimpleActionGroup> action_group;
 
   private:
-    std::shared_ptr<GMenu> create_menu ();
+    void create_menu ();
+    void rebuild_submenu();
 
   private:
     bool should_be_visible ();
@@ -64,6 +71,9 @@
 
   private:
     GSimpleAction * create_settings_action ();
+
+  private:
+    GSimpleAction * create_licence_action ();
 };
 
 #endif /* __INDICATOR_LOCATION_PHONE_H__ */

=== modified file 'src/service.cc'
--- src/service.cc	2013-10-31 18:54:01 +0000
+++ src/service.cc	2014-09-02 18:21:47 +0000
@@ -29,9 +29,9 @@
 ***
 **/
 
-Service :: Service (const std::shared_ptr<Controller>& controller):
+Service :: Service (const std::shared_ptr<Controller>& controller, const std::shared_ptr<LicenseController>& license_controller):
   action_group (g_simple_action_group_new(), GObjectDeleter()),
-  phone_profile (controller, action_group),
+  phone_profile (controller, license_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	2013-10-31 18:54:01 +0000
+++ src/service.h	2014-09-02 18:21:47 +0000
@@ -23,6 +23,7 @@
 #include <memory>
 #include <set>
 
+#include "license-controller.h"
 #include "controller.h"
 #include "phone.h"
 #include "utils.h" // GObjectDeleter
@@ -30,7 +31,7 @@
 class Service
 {
   public:
-    Service (const std::shared_ptr<Controller>& controller);
+    Service (const std::shared_ptr<Controller>& controller, const std::shared_ptr<LicenseController>& license_controller);
     virtual ~Service ();
 
   private:

=== modified file 'src/utils.h'
--- src/utils.h	2013-08-22 13:56:02 +0000
+++ src/utils.h	2014-09-02 18:21:47 +0000
@@ -28,6 +28,7 @@
   void operator()(GObject            * o) { g_object_unref (o); }
 
   void operator()(GMenu              * o) { operator()(G_OBJECT(o)); }
+  void operator()(GDBusProxy         * o) { operator()(G_OBJECT(o)); }
   void operator()(GDBusConnection    * o) { operator()(G_OBJECT(o)); }
   void operator()(GSimpleActionGroup * o) { operator()(G_OBJECT(o)); }
 };

=== modified file 'tests/phone-test.cc'
--- tests/phone-test.cc	2013-10-08 18:10:12 +0000
+++ tests/phone-test.cc	2014-09-02 18:21:47 +0000
@@ -22,6 +22,7 @@
 #define INDICATOR_PROFILE     "phone"
 #include "gtest-dbus-indicator-fixture.h"
 
+#include "src/mock-license-controller.h"
 #include "src/controller-mock.h"
 #include "src/service.h"
 
@@ -73,7 +74,7 @@
     {
       myController.reset (new MockController ());
       myController->add_listener (this);
-      myService.reset (new Service (myController));
+      myService.reset (new Service (myController, std::make_shared<MockLicenseController>()));
     }
 
     virtual void teardown_service ()