m/rdp-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep Android diagnostic device id stable

Browse Source
This commit is contained in:
Mikhail
2026-05-15 19:55:53 +03:00
parent baf6d74bec
commit 3344fe5020
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/android/app/build.gradle
+2 -2
View File
@@ -30,8 +30,8 @@ android {
applicationId "su.cin.rapvpn" applicationId "su.cin.rapvpn"
minSdk 26 minSdk 26
targetSdk 35 targetSdk 35
versionCode 206 versionCode 207
versionName "0.2.206" versionName "0.2.207"
buildConfigField "String", "DEFAULT_BACKEND_URL", "\"${normalizeGradleString(defaultBackendUrl)}\"" buildConfigField "String", "DEFAULT_BACKEND_URL", "\"${normalizeGradleString(defaultBackendUrl)}\""
buildConfigField "String", "DEFAULT_CLUSTER_ID", "\"${normalizeGradleString(defaultClusterId)}\"" buildConfigField "String", "DEFAULT_CLUSTER_ID", "\"${normalizeGradleString(defaultClusterId)}\""
buildConfigField "String", "DEFAULT_ORGANIZATION_ID", "\"${normalizeGradleString(defaultOrganizationId)}\"" buildConfigField "String", "DEFAULT_ORGANIZATION_ID", "\"${normalizeGradleString(defaultOrganizationId)}\""
clients/android/app/src/main/java/su/cin/rapvpn/RapDiagnosticService.java
+6 -4
View File
@@ -1056,14 +1056,16 @@ public class RapDiagnosticService extends Service {
} }
private String diagnosticDeviceId(SharedPreferences prefs) { private String diagnosticDeviceId(SharedPreferences prefs) {
String trusted = prefs.getString(PREF_DEVICE_ID, "");
if (trusted != null && !trusted.trim().isEmpty()) {
return trusted.trim();
}
String cached = prefs.getString(PREF_DIAGNOSTIC_DEVICE_ID, ""); String cached = prefs.getString(PREF_DIAGNOSTIC_DEVICE_ID, "");
if (cached != null && !cached.trim().isEmpty()) { if (cached != null && !cached.trim().isEmpty()) {
return cached.trim(); return cached.trim();
} }
String trusted = prefs.getString(PREF_DEVICE_ID, "");
if (trusted != null && trusted.trim().startsWith("diag-")) {
String stable = trusted.trim();
prefs.edit().putString(PREF_DIAGNOSTIC_DEVICE_ID, stable).apply();
return stable;
}
String androidId = ""; String androidId = "";
try { try {
androidId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID); androidId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);