From 42994d00e12770181f9a9698571d338acfcf536c Mon Sep 17 00:00:00 2001
From: Thor963 <thor@redhorse.tech>
Date: Wed, 26 Aug 2026 20:59:42 +0530
Subject: [PATCH] fix: added random uid as main identifier

---
 .../java/com/stallion/storage/StallionConfig.java    | 12 ++----------
 ios/main/StallionConfig.m                            |  8 ++------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/android/src/main/java/com/stallion/storage/StallionConfig.java b/android/src/main/java/com/stallion/storage/StallionConfig.java
index 2b48e3b..b5096b0 100644
--- a/android/src/main/java/com/stallion/storage/StallionConfig.java
+++ b/android/src/main/java/com/stallion/storage/StallionConfig.java
@@ -4,7 +4,6 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.res.Resources;
-import android.provider.Settings;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -53,7 +52,7 @@ public StallionConfig(Context context, SharedPreferences sharedPreferences) {
     );
     this.publicSigningKey = stallionPublicKeyRes != 0 ? context.getString(stallionPublicKeyRes) : "";
 
-    // get or generate UID
+    // get or generate UID (random install-scoped UUID)
     String cachedUniqueId = sharedPreferences.getString(
       StallionConfigConstants.UNIQUE_ID_IDENTIFIER,
       ""
@@ -61,14 +60,7 @@ public StallionConfig(Context context, SharedPreferences sharedPreferences) {
     if(!cachedUniqueId.isEmpty()) {
       this.uid = cachedUniqueId;
     } else {
-      try {
-        this.uid = Settings.Secure.getString(
-          context.getContentResolver(),
-          Settings.Secure.ANDROID_ID
-        );
-      } catch (Exception ignored) {
-        this.uid = UUID.randomUUID().toString();
-      }
+      this.uid = UUID.randomUUID().toString();
       SharedPreferences.Editor editor = sharedPreferences.edit();
       editor.putString(StallionConfigConstants.UNIQUE_ID_IDENTIFIER, this.uid);
       editor.apply();
diff --git a/ios/main/StallionConfig.m b/ios/main/StallionConfig.m
index d96eb44..b75eb57 100644
--- a/ios/main/StallionConfig.m
+++ b/ios/main/StallionConfig.m
@@ -23,16 +23,12 @@ - (instancetype)initWithDefaults:(NSUserDefaults *)defaults {
         _lastUnverifiedHash = [defaults stringForKey:LAST_UNVERIFIED_KEY_IDENTIFIER] ?: @"";
         _baseUrl = [defaults stringForKey:BASE_URL_IDENTIFIER] ?: @"";
 
+        // get or generate UID (random install-scoped UUID)
         NSString *cachedUid = [defaults stringForKey:UNIQUE_ID_IDENTIFIER];
         if (cachedUid && ![cachedUid isEqualToString:@""]) {
             _uid = cachedUid;
         } else {
-            NSString *newUid = @"";
-            if ([UIDevice currentDevice].identifierForVendor) {
-                newUid = [UIDevice currentDevice].identifierForVendor.UUIDString;
-            } else {
-                newUid = [[NSUUID UUID] UUIDString];
-            }
+            NSString *newUid = [[NSUUID UUID] UUIDString];
             [defaults setObject:newUid forKey:UNIQUE_ID_IDENTIFIER];
             [defaults synchronize];
             _uid = newUid;