Merge lp:~unity-api-team/indicator-network/hotspot-cellular-enabled-properties into lp:indicator-network/15.10

[Pete Woods]

Add properties to determine if modems and hotspot functionality are available.

Add properties to determine if modems and hotspot functionality are available.

[Jonas G. Drange (jonas-drange)]

Does this scale at all? We should be making determinations about what device can have hotspot based on its capabilities—not the device name (are there no flo devices with modems, e.g.?)

I think this also makes the API ambiguous: we now have hotspotEnabled, hotspotSwitchEnabled, hotspotAvailable and hotspotStored. To be blunt, we'd need a logical matrix to determine what to show as enabled/disabled/populated/N/A in the UI.

For mako, we should try to fix the actual bugs that are causing the hotspot to fail, and for flo wee need enumerated capabilities from somewhere (SDK) in order to hide the hotspot (and cellular, phone) entry.

review: Disapprove

[Jonas G. Drange (jonas-drange)]

After some discussions with Ken, I'd be happy with a resubmit with modemsAvailable only. We can use this property in System Settings to show/hide panels that require a modem (Cellular and Hotspot) when one is present.

hotspotAvailable would then be unnecessary due to the fact that the indicator would just have to know whether or not a hotspot is stored—not if it is able to be created (which is always done in System Settings). And you can't create a hotspot in System Settings if there are no modems.

This will also hide the Hotspot and Cellular entries on flo. For mako, we'll just have to support it.

Hope that makes more sense.

review: Needs Resubmitting

=== modified file 'data/com.ubuntu.connectivity1.NetworkingStatus.xml'
--- data/com.ubuntu.connectivity1.NetworkingStatus.xml	2015-08-12 15:56:35 +0000
+++ data/com.ubuntu.connectivity1.NetworkingStatus.xml	2015-08-21 15:55:11 +0000
@@ -9,6 +9,9 @@
         <property name="FlightMode" type="b" access="read"/>
         <property name="WifiEnabled" type="b" access="read"/>
 
+        <property name="ModemAvailable" type="b" access="read"/>
+        <property name="HotspotAvailable" type="b" access="read"/>
+
         <property name="HotspotSsid" type="ay" access="read"/>
         <property name="HotspotEnabled" type="b" access="read"/>
         <property name="HotspotMode" type="s" access="read"/>
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-18 08:46:30 +0000
+++ debian/changelog	2015-08-21 15:55:11 +0000
@@ -1,3 +1,10 @@
+indicator-network (0.5.4-0ubuntu0) UNRELEASED; urgency=medium
+
+  * Add properties to determine if modems and hotspot functionality are
+    available. (LP: #1487158) (LP: #1487157)
+
+ -- Pete Woods <[e-mail]>  Fri, 21 Aug 2015 16:51:14 +0100
+
 indicator-network (0.5.3+15.10.20150818-0ubuntu1) wily; urgency=medium
 
   [ Pete Woods ]
 
=== modified file 'debian/control'
--- debian/control	2015-08-03 13:27:40 +0000
+++ debian/control	2015-08-21 15:55:11 +0000
@@ -32,7 +32,7 @@
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                valgrind [amd64 armhf i386 powerpc],
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead. ~indicator-applet-developers will notice
 # and sync up the code again.
@@ -89,8 +89,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          indicator-network (>= ${source:Version}),
-Recommends:
-         indicator-network (>= 0.5.1+14.10.20140819),
 Description: Ubuntu Connectivity Qt API
  Ubuntu Connectivity API - Qt bindings
 
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2015-08-16 16:43:16 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2015-08-21 15:55:11 +0000
@@ -130,6 +130,14 @@
             Q_EMIT p.statusUpdated(status);
             Q_EMIT p.onlineUpdated(status == Status::Online);
         }
+        else if (name == "ModemAvailable")
+        {
+            Q_EMIT p.modemAvailableUpdated(value.toBool());
+        }
+        else if (name == "HotspotAvailable")
+        {
+            Q_EMIT p.hotspotAvailableUpdated(value.toBool());
+        }
         else if (name == "HotspotEnabled")
         {
             Q_EMIT p.hotspotEnabledUpdated(value.toBool());
@@ -285,6 +293,16 @@
     return d->m_writePropertyCache->get("HotspotPassword").toString();
 }
 
+bool Connectivity::hotspotAvailable() const
+{
+    return d->m_propertyCache->get("HotspotAvailable").toBool();
+}
+
+bool Connectivity::modemAvailable() const
+{
+    return d->m_propertyCache->get("ModemAvailable").toBool();
+}
+
 bool Connectivity::hotspotEnabled() const
 {
     return d->m_propertyCache->get("HotspotEnabled").toBool();
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2015-08-14 16:03:42 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2015-08-21 15:55:11 +0000
@@ -108,6 +108,12 @@
     Q_PROPERTY(bool hotspotSwitchEnabled READ hotspotSwitchEnabled NOTIFY hotspotSwitchEnabledUpdated)
     bool hotspotSwitchEnabled() const;
 
+    Q_PROPERTY(bool modemAvailable READ modemAvailable NOTIFY modemAvailableUpdated)
+    bool modemAvailable() const;
+
+    Q_PROPERTY(bool hotspotAvailable READ hotspotAvailable NOTIFY hotspotAvailableUpdated)
+    bool hotspotAvailable() const;
+
     Q_PROPERTY(QByteArray hotspotSsid READ hotspotSsid WRITE setHotspotSsid NOTIFY hotspotSsidUpdated)
     QByteArray hotspotSsid() const;
 
@@ -164,6 +170,10 @@
 
     void hotspotPasswordUpdated(const QString& password);
 
+    void modemAvailableUpdated(bool);
+
+    void hotspotAvailableUpdated(bool);
+
     void hotspotEnabledUpdated(bool);
 
     void hotspotModeUpdated(const QString& mode);
 
=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2015-08-17 15:38:34 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2015-08-21 15:55:11 +0000
@@ -112,6 +112,22 @@
                               { "HotspotSsid" });
     }
 
+    void modemAvailableUpdated()
+    {
+        notifyPropertyChanged(p,
+                              DBusTypes::SERVICE_PATH,
+                              DBusTypes::SERVICE_INTERFACE,
+                              { "ModemAvailable" });
+    }
+
+    void hotspotAvailableUpdated()
+    {
+        notifyPropertyChanged(p,
+                              DBusTypes::SERVICE_PATH,
+                              DBusTypes::SERVICE_INTERFACE,
+                              { "HotspotAvailable" });
+    }
+
     void hotspotEnabledUpdated()
     {
         notifyPropertyChanged(p,
@@ -207,6 +223,9 @@
     connect(d->m_manager.get(), &Manager::wifiEnabledUpdated, d.get(), &Private::wifiEnabledUpdated);
     connect(d->m_manager.get(), &Manager::unstoppableOperationHappeningUpdated, d.get(), &Private::unstoppableOperationHappeningUpdated);
 
+    connect(d->m_manager.get(), &Manager::modemAvailableChanged, d.get(), &Private::modemAvailableUpdated);
+    connect(d->m_manager.get(), &Manager::hotspotAvailableChanged, d.get(), &Private::hotspotAvailableUpdated);
+
     connect(d->m_manager.get(), &Manager::hotspotEnabledChanged, d.get(), &Private::hotspotEnabledUpdated);
     connect(d->m_manager.get(), &Manager::hotspotSsidChanged, d.get(), &Private::hotspotSsidUpdated);
     connect(d->m_manager.get(), &Manager::hotspotPasswordChanged, d.get(), &Private::hotspotPasswordUpdated);
@@ -275,6 +294,16 @@
             && !d->m_manager->flightMode();
 }
 
+bool ConnectivityService::modemAvailable() const
+{
+    return d->m_manager->modemAvailable();
+}
+
+bool ConnectivityService::hotspotAvailable() const
+{
+    return d->m_manager->hotspotAvailable();
+}
+
 bool ConnectivityService::hotspotEnabled() const
 {
     return d->m_manager->hotspotEnabled();
 
=== modified file 'src/indicator/connectivity-service/connectivity-service.h'
--- src/indicator/connectivity-service/connectivity-service.h	2015-08-14 10:29:55 +0000
+++ src/indicator/connectivity-service/connectivity-service.h	2015-08-21 15:55:11 +0000
@@ -65,6 +65,12 @@
     Q_PROPERTY(bool HotspotSwitchEnabled READ hotspotSwitchEnabled)
     bool hotspotSwitchEnabled() const;
 
+    Q_PROPERTY(bool ModemAvailable READ modemAvailable)
+    bool modemAvailable() const;
+
+    Q_PROPERTY(bool HotspotAvailable READ hotspotAvailable)
+    bool hotspotAvailable() const;
+
     Q_PROPERTY(bool HotspotEnabled READ hotspotEnabled)
     bool hotspotEnabled() const;
 
 
=== modified file 'src/indicator/nmofono/hotspot-manager.cpp'
--- src/indicator/nmofono/hotspot-manager.cpp	2015-08-17 11:01:23 +0000
+++ src/indicator/nmofono/hotspot-manager.cpp	2015-08-21 15:55:11 +0000
@@ -216,6 +216,27 @@
         return index >= 0;
     }
 
+    bool isKnownBadHardware()
+    {
+        const static QSet<QString> KNOWN_BAD_HARDWARE {"mako", "flo"};
+
+        QString program("getprop");
+        QStringList arguments;
+        arguments << "ro.hardware";
+
+        QProcess getprop;
+        getprop.start(program, arguments);
+
+        if (!getprop.waitForFinished())
+        {
+            qCritical() << "getprop process failed:" << getprop.errorString();
+            return false;
+        }
+
+        QString hardware = QString::fromUtf8(getprop.readAllStandardOutput()).trimmed();
+        return KNOWN_BAD_HARDWARE.contains(hardware);
+    }
+
     /**
      * True if changed successfully, or there was no need. Otherwise false.
      * Supported modes are 'p2p', 'sta' and 'ap'.
@@ -636,6 +657,7 @@
     QPowerd::RequestSPtr m_wakelock;
 
     bool m_isHybrisWlan = false;
+    bool m_isKnownBadHardware = false;
     bool m_disconnectWifi = false;
 
     /**
@@ -661,6 +683,7 @@
         QObject(parent), d(new Priv(*this))
 {
     d->m_isHybrisWlan = d->isHybrisWlan();
+    d->m_isKnownBadHardware = d->isKnownBadHardware();
 
     d->m_manager = make_unique<OrgFreedesktopNetworkManagerInterface>(
             NM_DBUS_SERVICE, NM_DBUS_PATH, connection);
@@ -780,6 +803,10 @@
 
 }
 
+bool HotspotManager::knownBadHardware() const {
+    return d->m_isKnownBadHardware;
+}
+
 bool HotspotManager::enabled() const {
     return d->m_enabled;
 }
 
=== modified file 'src/indicator/nmofono/hotspot-manager.h'
--- src/indicator/nmofono/hotspot-manager.h	2015-08-17 11:01:23 +0000
+++ src/indicator/nmofono/hotspot-manager.h	2015-08-21 15:55:11 +0000
@@ -118,6 +118,10 @@
         READ disconnectWifi
         NOTIFY disconnectWifiChanged)
 
+    Q_PROPERTY( bool knownBadHardware
+        READ knownBadHardware
+        NOTIFY knownBadHardwareChanged)
+
 public:
     typedef std::shared_ptr<HotspotManager> SPtr;
 
@@ -137,6 +141,8 @@
 
     bool disconnectWifi() const;
 
+    bool knownBadHardware() const;
+
 Q_SIGNALS:
     void enabledChanged(bool enabled);
 
@@ -150,6 +156,8 @@
 
     void disconnectWifiChanged(bool disconnect);
 
+    void knownBadHardwareChanged(bool knownBadHardware);
+
     /*
      * The mapping of code to string is taken from
      *  http://bazaar.launchpad.net/~vcs-imports/
 
=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2015-08-18 08:39:29 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2015-08-21 15:55:11 +0000
@@ -69,6 +69,9 @@
     bool m_wifiEnabled = false;
     KillSwitch::Ptr m_killSwitch;
 
+    bool m_modemAvailable = false;
+    bool m_hotspotAvailable = false;
+
     QSet<Link::Ptr> m_nmLinks;
     QMap<QString, wwan::Modem::Ptr> m_ofonoLinks;
 
@@ -144,6 +147,32 @@
         Q_EMIT p.wifiEnabledUpdated(m_wifiEnabled);
     }
 
+    void updateModemAvailable()
+    {
+        bool modemAvailable = !m_ofonoLinks.empty();
+
+        if (m_modemAvailable == modemAvailable)
+        {
+            return;
+        }
+
+        m_modemAvailable = modemAvailable;
+        Q_EMIT p.modemAvailableChanged(m_modemAvailable);
+    }
+
+    void updateHotspotAvailable()
+    {
+        bool hotspotAvailable = !m_ofonoLinks.empty() && !m_hotspotManager->knownBadHardware();
+
+        if (m_hotspotAvailable == hotspotAvailable)
+        {
+            return;
+        }
+
+        m_hotspotAvailable = hotspotAvailable;
+        Q_EMIT p.hotspotAvailableChanged(m_hotspotAvailable);
+    }
+
     void setFlightMode(bool newStatus)
     {
         if (m_flightMode == newStatus)
@@ -211,6 +240,9 @@
 
         Q_EMIT p.linksUpdated();
         m_unlockDialog->setShowSimIdentifiers(m_ofonoLinks.size() > 1);
+
+        updateModemAvailable();
+        updateHotspotAvailable();
     }
 };
 
@@ -250,6 +282,16 @@
     d->m_unlockDialog = make_shared<SimUnlockDialog>(notificationManager);
     connect(d->m_unlockDialog.get(), &SimUnlockDialog::ready, d.get(), &Private::sim_unlock_ready);
 
+    d->m_hotspotManager = make_shared<HotspotManager>(systemConnection);
+    connect(d->m_hotspotManager.get(), &HotspotManager::enabledChanged, this, &Manager::hotspotEnabledChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::ssidChanged, this, &Manager::hotspotSsidChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::passwordChanged, this, &Manager::hotspotPasswordChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::modeChanged, this, &Manager::hotspotModeChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::storedChanged, this, &Manager::hotspotStoredChanged);
+    connect(d->m_hotspotManager.get(), &HotspotManager::knownBadHardwareChanged, d.get(), &Private::updateHotspotAvailable);
+
+    connect(d->m_hotspotManager.get(), &HotspotManager::reportError, this, &Manager::reportError);
+
     d->m_ofono = make_shared<QOfonoManager>();
     connect(d->m_ofono.get(), &QOfonoManager::modemsChanged, d.get(), &Private::modems_changed);
     d->modems_changed(d->m_ofono->modems());
@@ -262,15 +304,6 @@
     d->m_killSwitch = make_shared<KillSwitch>(systemConnection);
     connect(d->m_killSwitch.get(), &KillSwitch::stateChanged, d.get(), &Private::updateHasWifi);
 
-    d->m_hotspotManager = make_shared<HotspotManager>(systemConnection);
-    connect(d->m_hotspotManager.get(), &HotspotManager::enabledChanged, this, &Manager::hotspotEnabledChanged);
-    connect(d->m_hotspotManager.get(), &HotspotManager::ssidChanged, this, &Manager::hotspotSsidChanged);
-    connect(d->m_hotspotManager.get(), &HotspotManager::passwordChanged, this, &Manager::hotspotPasswordChanged);
-    connect(d->m_hotspotManager.get(), &HotspotManager::modeChanged, this, &Manager::hotspotModeChanged);
-    connect(d->m_hotspotManager.get(), &HotspotManager::storedChanged, this, &Manager::hotspotStoredChanged);
-
-    connect(d->m_hotspotManager.get(), &HotspotManager::reportError, this, &Manager::reportError);
-
     connect(d->nm.get(), &OrgFreedesktopNetworkManagerInterface::DeviceAdded, this, &ManagerImpl::device_added);
     QList<QDBusObjectPath> devices(d->nm->GetDevices());
     for(const auto &path : devices) {
@@ -324,6 +357,18 @@
 }
 
 bool
+ManagerImpl::modemAvailable() const
+{
+    return !d->m_ofonoLinks.empty();
+}
+
+bool
+ManagerImpl::hotspotAvailable() const
+{
+    return !d->m_hotspotManager->knownBadHardware();
+}
+
+bool
 ManagerImpl::hotspotEnabled() const
 {
     return d->m_hotspotManager->enabled();
 
=== modified file 'src/indicator/nmofono/manager-impl.h'
--- src/indicator/nmofono/manager-impl.h	2015-08-14 15:52:39 +0000
+++ src/indicator/nmofono/manager-impl.h	2015-08-21 15:55:11 +0000
@@ -71,6 +71,10 @@
     void unlockAllModems() override;
     void unlockModemByName(const QString &name) override;
 
+    bool modemAvailable() const override;
+
+    bool hotspotAvailable() const override;
+
     bool hotspotEnabled() const override;
 
     bool hotspotStored() const override;
 
=== modified file 'src/indicator/nmofono/manager.h'
--- src/indicator/nmofono/manager.h	2015-08-14 15:52:39 +0000
+++ src/indicator/nmofono/manager.h	2015-08-21 15:55:11 +0000
@@ -122,6 +122,12 @@
 
     virtual void unlockModemByName(const QString &name) = 0;
 
+    Q_PROPERTY(bool modemAvailable READ modemAvailable NOTIFY modemAvailableChanged)
+    virtual bool modemAvailable() const = 0;
+
+    Q_PROPERTY(bool hotspotAvailable READ hotspotAvailable NOTIFY hotspotAvailableChanged)
+    virtual bool hotspotAvailable() const = 0;
+
     Q_PROPERTY(bool hotspotEnabled READ hotspotEnabled WRITE setHotspotEnabled NOTIFY hotspotEnabledChanged)
     virtual bool hotspotEnabled() const = 0;
 
@@ -150,6 +156,10 @@
 
     void wifiEnabledUpdated(bool);
 
+    void modemAvailableChanged(bool);
+
+    void hotspotAvailableChanged(bool);
+
     void hotspotEnabledChanged(bool enabled);
 
     void hotspotStoredChanged(bool stored);
 
=== modified file 'tests/integration/test-connectivity-api.cpp'
--- tests/integration/test-connectivity-api.cpp	2015-08-17 15:38:34 +0000
+++ tests/integration/test-connectivity-api.cpp	2015-08-21 15:55:11 +0000
@@ -630,4 +630,19 @@
     }
 }
 
+TEST_F(TestConnectivityApi, HotspotModemAvailable)
+{
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_DISCONNECTED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    EXPECT_TRUE(connectivity->hotspotAvailable());
+    EXPECT_TRUE(connectivity->modemAvailable());
+}
+
 }