Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 2687807

Browse files
implement client unique id using uuid for Android (#2592)
1 parent cbbc331 commit 2687807

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

android/app/src/main/java/com/microsoft/codepush/react/CodePushConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ public class CodePushConstants {
3131
public static final String LATEST_ROLLBACK_PACKAGE_HASH_KEY = "packageHash";
3232
public static final String LATEST_ROLLBACK_TIME_KEY = "time";
3333
public static final String LATEST_ROLLBACK_COUNT_KEY = "count";
34+
public static final String CLIENT_UNIQUE_ID_KEY = "clientUniqueId";
3435
}

android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.microsoft.codepush.react;
22

33
import android.app.Activity;
4+
import android.content.SharedPreferences;
45
import android.os.AsyncTask;
56
import android.os.Handler;
67
import android.os.Looper;
@@ -34,6 +35,7 @@
3435
import java.util.HashMap;
3536
import java.util.List;
3637
import java.util.Map;
38+
import java.util.UUID;
3739

3840
public class CodePushNativeModule extends ReactContextBaseJavaModule {
3941
private String mBinaryContentsHash = null;
@@ -60,7 +62,13 @@ public CodePushNativeModule(ReactApplicationContext reactContext, CodePush codeP
6062

6163
// Initialize module state while we have a reference to the current context.
6264
mBinaryContentsHash = CodePushUpdateUtils.getHashForBinaryContents(reactContext, mCodePush.isDebugMode());
63-
mClientUniqueId = Settings.Secure.getString(reactContext.getContentResolver(), Settings.Secure.ANDROID_ID);
65+
66+
SharedPreferences preferences = codePush.getContext().getSharedPreferences(CodePushConstants.CODE_PUSH_PREFERENCES, 0);
67+
mClientUniqueId = preferences.getString(CodePushConstants.CLIENT_UNIQUE_ID_KEY, null);
68+
if (mClientUniqueId == null) {
69+
mClientUniqueId = UUID.randomUUID().toString();
70+
preferences.edit().putString(CodePushConstants.CLIENT_UNIQUE_ID_KEY, mClientUniqueId).apply();
71+
}
6472
}
6573

6674
@Override

0 commit comments

Comments
 (0)