ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a better device name for registering push notifications

Browse Source
This commit is contained in:
Michael Zanetti 2018-12-19 14:03:14 +01:00
parent e882cb6794
commit f8bcd3d6e0
8 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app/platformhelper.h
View File

@ -10,6 +10,7 @@ class PlatformHelper : public QObject
Q_PROPERTY(QString deviceSerial READ deviceSerial CONSTANT) Q_PROPERTY(QString deviceSerial READ deviceSerial CONSTANT)
Q_PROPERTY(QString deviceModel READ deviceModel CONSTANT) Q_PROPERTY(QString deviceModel READ deviceModel CONSTANT)
Q_PROPERTY(QString deviceManufacturer READ deviceManufacturer CONSTANT) Q_PROPERTY(QString deviceManufacturer READ deviceManufacturer CONSTANT)
Q_PROPERTY(QString machineHostname READ machineHostname CONSTANT)
public: public:
explicit PlatformHelper(QObject *parent = nullptr); explicit PlatformHelper(QObject *parent = nullptr);
@ -18,6 +19,7 @@ public:
Q_INVOKABLE virtual void requestPermissions() = 0; Q_INVOKABLE virtual void requestPermissions() = 0;
virtual bool hasPermissions() const = 0; virtual bool hasPermissions() const = 0;
virtual QString machineHostname() const = 0;
virtual QString deviceSerial() const = 0; virtual QString deviceSerial() const = 0;
virtual QString deviceModel() const = 0; virtual QString deviceModel() const = 0;
virtual QString deviceManufacturer() const = 0; virtual QString deviceManufacturer() const = 0;

6
nymea-app/platformintegration/android/platformhelperandroid.cpp
View File

@ -22,6 +22,12 @@ bool PlatformHelperAndroid::hasPermissions() const
return true; return true;
} }
QString PlatformHelperAndroid::machineHostname() const
{
// QSysInfo::machineHostname always gives "localhost" on android... best we can do here is:
return deviceManufacturer() + " " + deviceModel();
}
QString PlatformHelperAndroid::deviceSerial() const QString PlatformHelperAndroid::deviceSerial() const
{ {
QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;"); QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");

1
nymea-app/platformintegration/android/platformhelperandroid.h
View File

@ -14,6 +14,7 @@ public:
Q_INVOKABLE void requestPermissions() override; Q_INVOKABLE void requestPermissions() override;
bool hasPermissions() const override; bool hasPermissions() const override;
QString machineHostname() const override;
QString deviceSerial() const override; QString deviceSerial() const override;
QString deviceModel() const override; QString deviceModel() const override;
QString deviceManufacturer() const override; QString deviceManufacturer() const override;

5
nymea-app/platformintegration/generic/platformhelpergeneric.cpp
View File

@ -15,6 +15,11 @@ bool PlatformHelperGeneric::hasPermissions() const
return true; return true;
} }
QString PlatformHelperGeneric::machineHostname() const
{
return QSysInfo::machineHostName();
}
QString PlatformHelperGeneric::deviceSerial() const QString PlatformHelperGeneric::deviceSerial() const
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)

1
nymea-app/platformintegration/generic/platformhelpergeneric.h
View File

@ -13,6 +13,7 @@ public:
Q_INVOKABLE virtual void requestPermissions() override; Q_INVOKABLE virtual void requestPermissions() override;
virtual bool hasPermissions() const override; virtual bool hasPermissions() const override;
virtual QString machineHostname() const override;
virtual QString deviceSerial() const override; virtual QString deviceSerial() const override;
virtual QString deviceModel() const override; virtual QString deviceModel() const override;
virtual QString deviceManufacturer() const override; virtual QString deviceManufacturer() const override;

5
nymea-app/platformintegration/ios/platformhelperios.cpp
View File

@ -17,6 +17,11 @@ bool PlatformHelperIOS::hasPermissions() const
return true; return true;
} }
QString PlatformHelperIOS::machineHostname() const
{
return QSysInfo::machineHostName();
}
QString PlatformHelperIOS::deviceSerial() const QString PlatformHelperIOS::deviceSerial() const
{ {
// There is no way on iOS to get to a persistent serial number of the device. // There is no way on iOS to get to a persistent serial number of the device.

1
nymea-app/platformintegration/ios/platformhelperios.h
View File

@ -14,6 +14,7 @@ public:
Q_INVOKABLE virtual void requestPermissions() override; Q_INVOKABLE virtual void requestPermissions() override;
virtual bool hasPermissions() const override; virtual bool hasPermissions() const override;
virtual QString machineHostname() const override;
virtual QString deviceSerial() const override; virtual QString deviceSerial() const override;
virtual QString deviceModel() const override; virtual QString deviceModel() const override;
virtual QString deviceManufacturer() const override; virtual QString deviceManufacturer() const override;

2
nymea-app/ui/RootItem.qml
View File

@ -157,7 +157,7 @@ Item {
PlatformHelper.requestPermissions(); PlatformHelper.requestPermissions();
} }
} else { } else {
AWSClient.registerPushNotificationEndpoint(PushNotifications.token, PlatformHelper.deviceManufacturer + " " + PlatformHelper.deviceModel, PlatformHelper.deviceSerial + "+io.guh.nymeaapp"); AWSClient.registerPushNotificationEndpoint(PushNotifications.token, PlatformHelper.machineHostname, PlatformHelper.deviceSerial + "+io.guh.nymeaapp");
} }
} }