Merge lp:~unity-api-team/indicator-network/unlock-modem-api-14.09 into lp:indicator-network/14.09

[Antti Kaijanmäki]

add com.ubuntu.connectivity1.Private.UnlockModem

$ dbus-send --session --print-reply --dest=com.ubuntu.connectivity1 /com/ubuntu/connectivity1/Private com.ubuntu.connectivity1.Private.UnlockModem string:/ril_0

Test cases to run:
https://wiki.ubuntu.com/Process/Merges/TestPlan/indicator-network#Test_Case:_indicator-network.2BAC8-unlock-sim-connectivity-service-dbus-api

[Jussi Pakkanen (jpakkane)]

Looks good.

review: Approve

=== modified file 'src/dbus-cpp/services/connectivity.h'
--- src/dbus-cpp/services/connectivity.h	2014-10-23 21:46:41 +0000
+++ src/dbus-cpp/services/connectivity.h	2014-12-09 10:47:58 +0000
@@ -129,6 +129,22 @@
                     return std::chrono::seconds{30};
                 }
             };
+
+            struct UnlockModem {
+                static const std::string& name()
+                {
+                    static const std::string s{"UnlockModem"};
+                    return s;
+                }
+
+                typedef Private Interface;
+                typedef void ValueType;
+
+                static std::chrono::milliseconds default_timeout()
+                {
+                    return std::chrono::seconds{30};
+                }
+            };
         };
 
         Private(std::shared_ptr<core::dbus::Service> &service,

=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2014-10-31 14:15:50 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2014-12-09 10:47:58 +0000
@@ -101,7 +101,8 @@
     core::dbus::Object::Ptr m_privateObject;
     std::shared_ptr<com::ubuntu::connectivity::Interface::Private> m_private;
 
-    core::Signal<> m_unlockAllModems;
+    core::Signal<>            m_unlockAllModems;
+    core::Signal<std::string> m_unlockModem;
 
     std::shared_ptr<networking::Manager> m_manager;
 
@@ -201,6 +202,28 @@
         auto that = shared_from_this();
         GMainLoopDispatch([that](){ that->m_unlockAllModems(); });
     });
+
+    m_privateObject->install_method_handler<com::ubuntu::connectivity::Interface::Private::Method::UnlockModem>([this](const core::dbus::Message::Ptr& msg)
+    {
+        core::dbus::Message::Reader reader;
+        try {
+            reader = msg->reader();
+        } catch(...) {
+            m_bus->send(core::dbus::Message::make_error(msg, "org.freedesktop.DBus.Error.InvalidArgs", "no modem name specified"));
+            return;
+        }
+        if (reader.type() != core::dbus::ArgumentType::string) {
+            m_bus->send(core::dbus::Message::make_error(msg, "org.freedesktop.DBus.Error.InvalidArgs", "modem name must be a string"));
+            return;
+        }
+        std::string name = reader.pop_string();
+
+        auto reply = core::dbus::Message::make_method_return(msg);
+        m_bus->send(reply);
+
+        auto that = shared_from_this();
+        GMainLoopDispatch([that, name](){ that->m_unlockModem(name); });
+    });
 }
 
 ConnectivityService::Private::~Private()
@@ -333,3 +356,9 @@
     return d->m_unlockAllModems;
 }
 
+core::Signal<std::string> &
+ConnectivityService::unlockModem()
+{
+    return d->m_unlockModem;
+}
+

=== modified file 'src/indicator/connectivity-service/connectivity-service.h'
--- src/indicator/connectivity-service/connectivity-service.h	2014-10-29 18:12:05 +0000
+++ src/indicator/connectivity-service/connectivity-service.h	2014-12-09 10:47:58 +0000
@@ -34,6 +34,11 @@
      */
     core::Signal<> &unlockAllModems();
 
+    /**
+     * synced with GMainLoop
+     */
+    core::Signal<std::string> &unlockModem();
+
 private:
     class Private;
     std::shared_ptr<Private> d;

=== modified file 'src/indicator/indicator-network-service.cpp'
--- src/indicator/indicator-network-service.cpp	2014-10-29 18:12:05 +0000
+++ src/indicator/indicator-network-service.cpp	2014-12-09 10:47:58 +0000
@@ -90,6 +90,9 @@
     // unlockAllModems is dispatched from GMainLoop
     connectivityService->unlockAllModems().connect([menu](){ menu->unlockAllModems(); });
 
+    // unlockModem is dispatched from GMainLoop
+    connectivityService->unlockModem().connect([menu](const std::string &name){ menu->unlockModem(name); });
+
     if (getenv("VALGRIND") != 0) {
         g_timeout_add(1000, (GSourceFunc)stop_main_loop, nullptr);
         mainloop.run();

=== modified file 'src/indicator/modem-manager.cpp'
--- src/indicator/modem-manager.cpp	2014-10-31 14:15:50 +0000
+++ src/indicator/modem-manager.cpp	2014-12-09 10:47:58 +0000
@@ -234,6 +234,20 @@
     }
 }
 
+void
+ModemManager::unlockModemByName(const std::string &name)
+{
+#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
+    std::cout << __PRETTY_FUNCTION__ << std::endl;
+#endif
+    for (auto const &m : d->m_modems.get()) {
+        if (m->name() == name) {
+            unlockModem(m);
+            return;
+        }
+    }
+}
+
 
 const core::Property<std::set<Modem::Ptr>> &
 ModemManager::modems()

=== modified file 'src/indicator/modem-manager.h'
--- src/indicator/modem-manager.h	2014-10-29 18:12:05 +0000
+++ src/indicator/modem-manager.h	2014-12-09 10:47:58 +0000
@@ -48,6 +48,11 @@
     void unlockAllModems();
 
     /**
+     * must be called from GMainLoop
+     */
+    void unlockModemByName(const std::string &name);
+
+    /**
      * changed() emitted from GMainLoop
      */
     const core::Property<std::set<Modem::Ptr>> &modems();

=== modified file 'src/indicator/modem.cpp'
--- src/indicator/modem.cpp	2014-10-29 18:12:05 +0000
+++ src/indicator/modem.cpp	2014-12-09 10:47:58 +0000
@@ -383,3 +383,10 @@
     return d->m_index;
 }
 
+const std::string &
+Modem::name() const
+{
+    return d->m_ofonoModem->object->path().as_string();
+}
+
+

=== modified file 'src/indicator/modem.h'
--- src/indicator/modem.h	2014-10-29 18:12:05 +0000
+++ src/indicator/modem.h	2014-12-09 10:47:58 +0000
@@ -101,6 +101,8 @@
     const core::Property<std::string> &simIdentifier();
     int index();
 
+    const std::string &name() const;
+
     static const std::string strengthIcon(int8_t strength)
     {
         /* Using same values as used by Android, not linear (LP: #1329945)*/

=== modified file 'src/indicator/service.h'
--- src/indicator/service.h	2014-10-09 10:58:30 +0000
+++ src/indicator/service.h	2014-12-09 10:47:58 +0000
@@ -167,6 +167,11 @@
     {
         m_wwanSection->unlockAllModems();
     }
+
+    void unlockModem(const std::string &name)
+    {
+        m_wwanSection->unlockModem(name);
+    }
 };
 
 #endif

=== modified file 'src/indicator/wwan-section.cpp'
--- src/indicator/wwan-section.cpp	2014-10-29 18:12:05 +0000
+++ src/indicator/wwan-section.cpp	2014-12-09 10:47:58 +0000
@@ -182,3 +182,9 @@
 {
     d->m_modemManager->unlockAllModems();
 }
+
+void
+WwanSection::unlockModem(const std::string &name)
+{
+    d->m_modemManager->unlockModemByName(name);
+}

=== modified file 'src/indicator/wwan-section.h'
--- src/indicator/wwan-section.h	2014-10-29 18:12:05 +0000
+++ src/indicator/wwan-section.h	2014-12-09 10:47:58 +0000
@@ -38,6 +38,7 @@
     virtual MenuModel::Ptr menuModel();
 
     void unlockAllModems();
+    void unlockModem(const std::string &name);
 };
 
 #endif