From 3344fe5020ace18e6c7441001abed124346cc918 Mon Sep 17 00:00:00 2001
From: Mikhail <misha_mst@mail.ru>
Date: Fri, 15 May 2026 19:55:53 +0300
Subject: [PATCH] Keep Android diagnostic device id stable

---
 clients/android/app/build.gradle                       |  4 ++--
 .../main/java/su/cin/rapvpn/RapDiagnosticService.java  | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/clients/android/app/build.gradle b/clients/android/app/build.gradle
index d97ac89..e04743b 100644
--- a/clients/android/app/build.gradle
+++ b/clients/android/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "su.cin.rapvpn"
         minSdk 26
         targetSdk 35
-        versionCode 206
-        versionName "0.2.206"
+        versionCode 207
+        versionName "0.2.207"
         buildConfigField "String", "DEFAULT_BACKEND_URL", "\"${normalizeGradleString(defaultBackendUrl)}\""
         buildConfigField "String", "DEFAULT_CLUSTER_ID", "\"${normalizeGradleString(defaultClusterId)}\""
         buildConfigField "String", "DEFAULT_ORGANIZATION_ID", "\"${normalizeGradleString(defaultOrganizationId)}\""
diff --git a/clients/android/app/src/main/java/su/cin/rapvpn/RapDiagnosticService.java b/clients/android/app/src/main/java/su/cin/rapvpn/RapDiagnosticService.java
index 0192e49..ea3e0c2 100644
--- a/clients/android/app/src/main/java/su/cin/rapvpn/RapDiagnosticService.java
+++ b/clients/android/app/src/main/java/su/cin/rapvpn/RapDiagnosticService.java
@@ -1056,14 +1056,16 @@ public class RapDiagnosticService extends Service {
     }
 
     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, "");
         if (cached != null && !cached.trim().isEmpty()) {
             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 = "";
         try {
             androidId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);