Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:geoclue-provider-hybris.changes
@@ -1,3 +1,22 @@ +* Wed May 09 2018 Franz-Josef Anton Friedrich Haider <f_haider@gmx.at> - 0.2.17 +- [geoclue-provider-hybris] Remove old oneshot script. +- [geoclue-provider-hybris] Remove old oneshot script. Contributes to JB#38781 + +* Thu Feb 01 2018 Matti Kosola <matti.kosola@jollamobile.com> - 0.2.16 +- [geoclue-providers-hybris] don't fail if /system/etc/gps.conf is missing. JB#40318 +- [geoclue-providers-hybris] remove certain groups from the setgroups call in order to avoid confusing the BSP. JB#40659, JB#39836 + +* Fri Jan 05 2018 Matti Kosola <matti.kosola@jollamobile.com> - 0.2.15 +- [geoclue-provider-hybris] download Xtra data automatically. +- [geoclue-provider-hybris] download Xtra data automatically. JB#40527, JB#39833, JB#39834, JB#39835, JB#39836, JB#40168, JB#40169, JB#40170. +- [geoclue-providers-hybris] add a gps callback that exists on some specific devices +- [geoclue-providers-hybris] add a gps callback that exists on some specific devices. JB#40318 +- [xtra] + +* Fri Dec 15 2017 Matti Kosola <matti.kosola@jollamobile.com> - 0.2.14 +- [geoclue-provider-hybris] Add support for new callbacks introduced in Android 7. +- [geoclue-provider-hybris] fix permissions with Android 7 based devices. JB#40615 + * Fri Jul 14 2017 Matti Kosola <matti.kosola@jollamobile.com> - 0.2.13 - [geoclue-provider-hybris] Fix building for Android 7. - [geoclue-provider-hybris] Fix building for Android 7. JB#39137
[-] [+]	Changed	_service:tar_git:geoclue-providers-hybris.spec ^
@@ -1,5 +1,5 @@ Name: geoclue-provider-hybris -Version: 0.2.13 +Version: 0.2.17 Release: 1 Summary: Geoinformation Service Hybris Provider Group: System/Libraries @@ -15,10 +15,7 @@ BuildRequires: pkgconfig(qofono-qt5) BuildRequires: pkgconfig(qofonoext) BuildRequires: pkgconfig(systemsettings) -BuildRequires: oneshot Requires: connectionagent-qt5 >= 0.9.20 -Requires: oneshot -%_oneshot_requires_post %description %{summary}. @@ -35,11 +32,6 @@ %install make INSTALL_ROOT=%{buildroot} install -mkdir -p %{buildroot}/%{_oneshotdir} -cp -a cleanup-magnetic-variation %{buildroot}/%{_oneshotdir} - -%post -%{_bindir}/add-oneshot --user --late cleanup-magnetic-variation %files %defattr(04755,root,root,-) @@ -48,5 +40,4 @@ %{_sysconfdir}/dbus-1 %{_datadir}/dbus-1 %{_datadir}/geoclue-providers/geoclue-hybris.provider -%attr(755, root, root) %{_oneshotdir}/cleanup-magnetic-variation
[-] [+]	Deleted	_service:tar_git:geoclue-provider-hybris-0.2.13.tar.gz/cleanup-magnetic-variation ^
@@ -1,4 +0,0 @@ -#!/bin/sh - -/usr/bin/dconf reset -f /system/osso/location/settings/magneticvariation -
[-] [+]	Changed	_service:tar_git:geoclue-provider-hybris-0.2.17.tar.gz/hybrisprovider.cpp ^
@@ -38,6 +38,8 @@ #include <qofonoextmodemmanager.h> +#include <android-config.h> + #include <strings.h> #include <sys/time.h> @@ -71,6 +73,9 @@ const QString LocationSettingsOldAgpsEnabledKey = QStringLiteral("location/agreement_accepted"); const QString LocationSettingsOldAgpsAgreementAcceptedKey = QStringLiteral("location/here_agreement_accepted"); +const int MaxXtraServers = 3; +const QString XtraConfigFile = QStringLiteral("/etc/gps_xtra.ini"); + void locationCallback(GpsLocation location) { Location loc; @@ -139,6 +144,53 @@ Q_ARG(QList<int>, usedPrns)); } +#if GEOCLUE_ANDROID_GPS_INTERFACE == 3 +void gnssSvStatusCallback(GnssSvStatus svStatus) +{ + QList<SatelliteInfo> satellites; + QList<int> usedPrns; + + for (int i = 0; i < svStatus->num_svs; ++i) { + SatelliteInfo satInfo; + GnssSvInfo &svInfo = svStatus->gnss_sv_list[i]; + satInfo.setPrn(svInfo.svid); + satInfo.setSnr(svInfo.c_n0_dbhz); + satInfo.setElevation(svInfo.elevation); + satInfo.setAzimuth(svInfo.azimuth); + satellites.append(satInfo); + + if (svInfo.flags & GNSS_SV_FLAGS_USED_IN_FIX) + usedPrns.append(svInfo.svid); + } + + QMetaObject::invokeMethod(staticProvider, "setSatellite", Qt::QueuedConnection, + Q_ARG(QList<SatelliteInfo>, satellites), + Q_ARG(QList<int>, usedPrns)); +} +#endif + +#ifdef USE_GPS_VENDOR_EXTENSION +void gnssSvStatusCallback_custom(GnssSvStatus svStatus) +{ + QList<SatelliteInfo> satellites; + QList<int> usedPrns; + + for (int i = 0; i < svStatus->num_svs; ++i) { + SatelliteInfo satInfo; + GnssSvInfo &svInfo = svStatus->sv_list[i]; + satInfo.setPrn(svInfo.prn); + satInfo.setSnr(svInfo.snr); + satInfo.setElevation(svInfo.elevation); + satInfo.setAzimuth(svInfo.azimuth); + satellites.append(satInfo); + } + + QMetaObject::invokeMethod(staticProvider, "setSatellite", Qt::QueuedConnection, + Q_ARG(QList<SatelliteInfo>, satellites), + Q_ARG(QList<int>, usedPrns)); +} +#endif + bool nmeaChecksumValid(const QByteArray &nmea) { unsigned char checksum = 0; @@ -229,6 +281,14 @@ QMetaObject::invokeMethod(staticProvider, "injectUtcTime", Qt::QueuedConnection); } +#if GEOCLUE_ANDROID_GPS_INTERFACE == 3 +void gnssSetSystemInfoCallback(const GnssSystemInfo info) +{ + Q_UNUSED(info) + qCDebug(lcGeoclueHybris); +} +#endif + void agpsStatusCallback(AGpsStatus status) { QHostAddress ipv4; @@ -236,7 +296,7 @@ QByteArray ssid; QByteArray password; -#if GEOCLUE_ANDROID_GPS_INTERFACE == 2 +#if GEOCLUE_ANDROID_GPS_INTERFACE >= 2 if (status->addr.ss_family == AF_INET) { ipv4.setAddress(status->ipaddr); } else if (status->addr.ss_family == AF_INET6) { @@ -281,7 +341,7 @@ QMetaObject::invokeMethod(staticProvider, "xtraDownloadRequest", Qt::QueuedConnection); } -#if GEOCLUE_ANDROID_GPS_INTERFACE == 2 +#if GEOCLUE_ANDROID_GPS_INTERFACE >= 2 ApnIpType fromContextProtocol(const QString &protocol) { if (protocol == QLatin1String("ip")) @@ -315,12 +375,19 @@ locationCallback, statusCallback, svStatusCallback, +#ifdef USE_GPS_VENDOR_EXTENSION + gnssSvStatusCallback_custom, +#endif nmeaCallback, setCapabilitiesCallback, acquireWakelockCallback, releaseWakelockCallback, createThreadCallback, - requestUtcTimeCallback + requestUtcTimeCallback, +#if GEOCLUE_ANDROID_GPS_INTERFACE == 3 + gnssSetSystemInfoCallback, + gnssSvStatusCallback, +#endif }; AGpsCallbacks agpsCallbacks = { @@ -428,12 +495,12 @@ HybrisProvider::HybrisProvider(QObject parent) : QObject(parent), m_gps(0), m_agps(0), m_agpsril(0), m_gpsni(0), m_xtra(0), - m_status(StatusUnavailable), m_positionInjectionConnected(false), m_xtraDownloadReply(0), + m_status(StatusUnavailable), m_positionInjectionConnected(false), m_xtraDownloadReply(0), m_xtraServerIndex(0), m_requestedConnect(false), m_gpsStarted(false), m_locationSettings(0), m_networkManager(new NetworkManager(this)), m_cellularTechnology(0), m_ofonoExtModemManager(new QOfonoExtModemManager(this)), m_connectionManager(new QOfonoConnectionManager(this)), m_connectionContext(0), m_ntpSocket(0), - m_agpsEnabled(false), m_agpsOnlineEnabled(false) + m_agpsEnabled(false), m_agpsOnlineEnabled(false), m_useForcedXtraInject(false), m_xtraUserAgent("") { if (staticProvider) qFatal("Only a single instance of HybrisProvider is supported."); @@ -454,6 +521,7 @@ m_manager = new QNetworkAccessManager(this); connect(m_networkManager, SIGNAL(technologiesChanged()), this, SLOT(technologiesChanged())); + connect(m_networkManager, SIGNAL(stateChanged(QString)), this, SLOT(stateChanged(QString))); technologiesChanged(); @@ -483,6 +551,48 @@ m_idleTimer.start(QuitIdleTime, this); } + QString xtraUserAgentFileName; + QSettings settings(XtraConfigFile, QSettings::IniFormat); + QString xtraServer; + + for (int i = 0; i < MaxXtraServers; i++) { + QString key = QString("xtra/XTRA_SERVER_%1").arg(i); + xtraServer = settings.value(key, "").toString(); + if (xtraServer != "") { + m_xtraServers.enqueue(xtraServer); + } + } + + m_useForcedXtraInject = settings.value("xtra/XTRA_FORCE_INJECT", "").toBool(); + + xtraUserAgentFileName = settings.value("xtra/XTRA_USERAGENT_FILE", "").toString(); + if (xtraUserAgentFileName != "") { + QFile xtraUserAgentFile(xtraUserAgentFileName); + if (xtraUserAgentFile.open(QIODevice::ReadOnly)) { + m_xtraUserAgent = xtraUserAgentFile.readLine(); + } + } + + if (m_xtraServers.isEmpty()) { + QFile gpsConf(QStringLiteral("/system/etc/gps.conf")); + if (gpsConf.open(QIODevice::ReadOnly)) { + + while (!gpsConf.atEnd()) { + const QByteArray line = gpsConf.readLine().trimmed(); + if (line.startsWith('#')) + continue; + + const QList<QByteArray> split = line.split('='); + if (split.length() != 2) + continue; + + const QByteArray key = split.at(0).trimmed(); + if (key == "XTRA_SERVER_1" \|\| key == "XTRA_SERVER_2" \|\| key == "XTRA_SERVER_3") + m_xtraServers.enqueue(QUrl::fromEncoded(split.at(1).trimmed())); + } + } + } + const hw_module_t *hwModule; int error = hw_get_module(GPS_HARDWARE_MODULE_ID, &hwModule); @@ -949,36 +1059,26 @@
[-] [+]	Changed	_service:tar_git:geoclue-provider-hybris-0.2.17.tar.gz/hybrisprovider.h ^
@@ -28,7 +28,9 @@ #include "locationtypes.h" // Define versions of the Android GPS interface supported. -#if ANDROID_VERSION_MAJOR >= 5 +#if ANDROID_VERSION_MAJOR >= 7 + #define GEOCLUE_ANDROID_GPS_INTERFACE 3 +#elif ANDROID_VERSION_MAJOR >= 5 #define GEOCLUE_ANDROID_GPS_INTERFACE 2 #elif ANDROID_VERSION_MAJOR == 4 && ANDROID_VERSION_MINOR >= 2 #define GEOCLUE_ANDROID_GPS_INTERFACE 1 @@ -153,6 +155,7 @@ void engineOff(); void technologiesChanged(); + void stateChanged(const QString &state); void defaultDataModemChanged(const QString &modem); void connectionManagerValidChanged(); void connectionContextValidChanged(); @@ -218,6 +221,7 @@ QNetworkAccessManager m_manager; QNetworkReply m_xtraDownloadReply; QQueue<QUrl> m_xtraServers; + int m_xtraServerIndex; ComJollaConnectiondInterface m_connectiond; ComJollaLipstickConnectionSelectorIfInterface m_connectionSelector; @@ -233,6 +237,7 @@ NetworkManager m_networkManager; NetworkTechnology m_cellularTechnology; + NetworkTechnology m_wifiTechnology; QOfonoExtModemManager m_ofonoExtModemManager; QOfonoConnectionManager *m_connectionManager; @@ -246,6 +251,8 @@ bool m_agpsEnabled; bool m_agpsOnlineEnabled; + bool m_useForcedXtraInject; + QString m_xtraUserAgent; double m_magneticVariation; };
[-] [+]	Changed	_service:tar_git:geoclue-provider-hybris-0.2.17.tar.gz/main.cpp ^
@@ -55,7 +55,22 @@ supplementaryGroups[numberGroups++] = group->gr_gid; -#if GEOCLUE_ANDROID_GPS_INTERFACE == 2 + // remove audio, radio and bluetooth groups to avoid confusion in BSP + char groups_to_remove[] = {"bluetooth", "radio", "audio", NULL}; + + int idx = 0; + while (groups_to_remove[idx]) { + group = getgrnam(groups_to_remove[idx]); + idx++; + + if (idx + 1 < numberGroups) { + memmove((void)&supplementaryGroups[idx], (void)&supplementaryGroups[idx + 1], (numberGroups - idx - 1) sizeof(gid_t)); + } + + numberGroups--; + } + +#if GEOCLUE_ANDROID_GPS_INTERFACE >= 2 group = getgrnam("net_raw"); if (group) { if (numberGroups + 1 > NGROUPS_MAX) @@ -69,7 +84,7 @@ if (numberGroups == -1) qFatal("Failed to set supplementary groups, %s", strerror(errno)); -#if GEOCLUE_ANDROID_GPS_INTERFACE != 2 +#if GEOCLUE_ANDROID_GPS_INTERFACE == 1 // Drop privileges. result = setuid(realUid); if (result == -1)