Merge branch 'jb44479' into 'master'

[lipstick] Add busy notifications for usb-mode selection. Contributes to JB#44479 See merge request mer-core/lipstick!106
sailfishos · Feb 22, 2019 · b33ad9f · b33ad9f
2 parents dfcffb5 + 6a18938
commit b33ad9f
Show file tree

Hide file tree

Showing 9 changed files with 349 additions and 155 deletions.
diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -5,7 +5,7 @@ Name:       lipstick-qt5
 %define icondirectory %{_datadir}/icons/hicolor/86x86/apps
 
 Summary:    QML toolkit for homescreen creation
-Version:    0.32.18
+Version:    0.33.1
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1
@@ -38,7 +38,7 @@ BuildRequires:  pkgconfig(ngf-qt5)
 BuildRequires:  pkgconfig(contextkit-statefs) >= 0.2.7
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(wayland-server)
-BuildRequires:  pkgconfig(usb-moded-qt5) >= 1.7
+BuildRequires:  pkgconfig(usb-moded-qt5) >= 1.8
 BuildRequires:  pkgconfig(systemsettings)
 BuildRequires:  pkgconfig(nemodevicelock)
 BuildRequires:  qt5-qttools-linguist

diff --git a/src/homeapplication.cpp b/src/homeapplication.cpp
@@ -181,6 +181,7 @@ HomeApplication::HomeApplication(int &argc, char **argv, const QString &qmlPath)
     m_qmlEngine->rootContext()->setContextProperty("LipstickSettings", LipstickSettings::instance());
     m_qmlEngine->rootContext()->setContextProperty("volumeControl", m_volumeControl);
     m_qmlEngine->rootContext()->setContextProperty("connectivityMonitor", m_connectivityMonitor);
+    m_qmlEngine->rootContext()->setContextProperty("usbModeSelector", m_usbModeSelector);
 
     connect(this, SIGNAL(homeReady()), this, SLOT(sendStartupNotifications()));
 }

diff --git a/src/notifications/batterynotifier.cpp b/src/notifications/batterynotifier.cpp
@@ -109,7 +109,9 @@ void BatteryNotifier::prepareNotification()
             toRemove << NotificationRemoveCharger
                      << NotificationChargingComplete
                      << NotificationLowBattery;
-            if (m_chargingCompletion == NeedsCharging) {
+            // In the case of USB devices, charging notifications on
+            // connection are handled by USBModeSelector rather than here.
+            if (m_chargingCompletion == NeedsCharging && !isUsbDevice()) {
                 toSend << NotificationCharging;
             }
         } else {
@@ -343,3 +345,9 @@ BatteryNotifier::ChargerType BatteryNotifier::getCharger() const
                   ? ChargerNo
                   : ChargerUnknown)));
 }
+
+bool BatteryNotifier::isUsbDevice() const
+{
+    QString name(propertyString(m_chargerType));
+    return (name == "dcp" || name == "cdp" || name == "usb");
+}
diff --git a/src/notifications/batterynotifier.h b/src/notifications/batterynotifier.h
@@ -125,6 +125,13 @@ private slots:
     ChargingState getState() const;
     ChargerType getCharger() const;
 
+    /*! Determines whether the current device is a USB device that will by
+     * handled by usb_moded.
+     *
+     * \returns true if the device will be handled by usb_moded, false o/w.
+     */
+    bool isUsbDevice() const;
+
     //! Low battery notifier for getting notifications about low battery state
     LowBatteryNotifier *m_lowBatteryNotifier;