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

switch to using ANDROID_ID instead of IMEI to identify a device across app installs

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-20 14:55:08 +02:00
parent b01b0bc97b
commit 0796c08fbd
4 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app-core/jsonrpc/jsonrpcclient.cpp
View File

@ -303,7 +303,7 @@ void JsonRpcClient::sendRequest(const QVariantMap &request)
{ {
QVariantMap newRequest = request; QVariantMap newRequest = request;
newRequest.insert("token", m_token); newRequest.insert("token", m_token);
// qDebug() << "Sending request" << qUtf8Printable(QJsonDocument::fromVariant(newRequest).toJson()); qDebug() << "Sending request" << qUtf8Printable(QJsonDocument::fromVariant(newRequest).toJson());
m_connection->sendData(QJsonDocument::fromVariant(newRequest).toJson(QJsonDocument::Compact) + "\n"); m_connection->sendData(QJsonDocument::fromVariant(newRequest).toJson(QJsonDocument::Compact) + "\n");
} }

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

@ -13,23 +13,17 @@ PlatformHelperAndroid::PlatformHelperAndroid(QObject *parent) : PlatformHelper(p
void PlatformHelperAndroid::requestPermissions() void PlatformHelperAndroid::requestPermissions()
{ {
QtAndroid::requestPermissions({"android.permission.READ_PHONE_STATE"}, &PlatformHelperAndroid::permissionRequestFinished); // Not using any fancy permissions in android yet...
} }
bool PlatformHelperAndroid::hasPermissions() const bool PlatformHelperAndroid::hasPermissions() const
{ {
QtAndroid::PermissionResult r = QtAndroid::checkPermission("android.permission.READ_PHONE_STATE"); // Not using any fancy permissions in android yet...
return r == QtAndroid::PermissionResult::Granted; return true;
} }
QString PlatformHelperAndroid::deviceSerial() const QString PlatformHelperAndroid::deviceSerial() const
{ {
QtAndroid::PermissionResult r = QtAndroid::checkPermission("android.permission.READ_PHONE_STATE");
if (r != QtAndroid::PermissionResult::Granted) {
qWarning() << "Cannot read device serial. No permissions";
return "";
}
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;");
return activity.callObjectMethod<jstring>("deviceSerial").toString(); return activity.callObjectMethod<jstring>("deviceSerial").toString();
} }

2
packaging/android/AndroidManifest.xml
View File

@ -85,6 +85,4 @@
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application. <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. --> Remove the comment if you do not require these default features. -->
<!-- %%INSERT_FEATURES --> <!-- %%INSERT_FEATURES -->
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
</manifest> </manifest>

18
packaging/android/src/io/guh/nymeaapp/NymeaAppActivity.java
View File

@ -5,6 +5,8 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.Build; import android.os.Build;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.provider.Settings.Secure;
//import com.google.firebase.messaging.MessageForwardingService; //import com.google.firebase.messaging.MessageForwardingService;
@ -12,21 +14,7 @@ public class NymeaAppActivity extends org.qtproject.qt5.android.bindings.QtActiv
{ {
public String deviceSerial() public String deviceSerial()
{ {
TelephonyManager TM = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); return Secure.getString(getApplicationContext().getContentResolver(), Secure.ANDROID_ID);
// IMEI No.
String imeiNo = TM.getDeviceId();
// IMSI No.
String imsiNo = TM.getSubscriberId();
// SIM Serial No.
String simSerialNo = TM.getSimSerialNumber();
// Android Unique ID
// String androidId = System.getString(this.getContentResolver(),Settings.Secure.ANDROID_ID);
return imeiNo;
} }
public static String deviceManufacturer() public static String deviceManufacturer()