From b1d1599a1c820333d49323557d703c01a43b04fb Mon Sep 17 00:00:00 2001 From: Titus-Andrei Moldovan Date: Tue, 21 Apr 2020 12:35:08 +0300 Subject: [PATCH] android: add a consistent deviceId for Amplitude from SharedPreferences --- .../src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java index 2b4bc232c..de5b421c8 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java @@ -17,6 +17,8 @@ package org.jitsi.meet.sdk; import android.annotation.SuppressLint; +import android.content.Context; +import android.content.SharedPreferences; import android.provider.Settings; import android.text.TextUtils; @@ -40,6 +42,8 @@ class AmplitudeModule extends ReactContextBaseJavaModule { public static final String NAME = "Amplitude"; + public static final String JITSI_PREFERENCES = "jitsi-preferences"; + public static final String AMPLITUDE_DEVICE_ID_KEY = "amplitudeDeviceId"; public AmplitudeModule(ReactApplicationContext reactContext) { super(reactContext); @@ -58,8 +62,8 @@ class AmplitudeModule Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey); // Set the device ID to something consistent. - String android_id - = Settings.Secure.getString(getReactApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID); + SharedPreferences sharedPreferences = getReactApplicationContext().getSharedPreferences(JITSI_PREFERENCES, Context.MODE_PRIVATE); + String android_id = sharedPreferences.getString(AMPLITUDE_DEVICE_ID_KEY, ""); if (!TextUtils.isEmpty(android_id)) { Amplitude.getInstance(instanceName).setDeviceId(android_id); }