From 315f41f4340958131e24ef5c2b6d9366a8435da7 Mon Sep 17 00:00:00 2001
From: Enginex0 <enginex0@users.noreply.github.com>
Date: Sun, 22 Mar 2026 01:12:25 +0100
Subject: [PATCH] fix(interception): align attest key nspace update with
 upstream #169

---
 .../interception/keystore/Keystore2Interceptor.kt           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt b/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt
index eb53799..e761022 100644
--- a/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt
+++ b/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt
@@ -392,13 +392,13 @@ object Keystore2Interceptor : AbstractKeystoreInterceptor() {
                                 callingUid,
                             )
 
-                        val newNspace = SecureRandom().nextLong()
-                        response.metadata.key?.let { it.nspace = newNspace }
+                        val key = response.metadata.key!!
+                        key.nspace = SecureRandom().nextLong()
                         KeyMintSecurityLevelInterceptor.generatedKeys[keyId] =
                             KeyMintSecurityLevelInterceptor.GeneratedKeyInfo(
                                 keyData.first,
                                 null,
-                                newNspace,
+                                key.nspace,
                                 response,
                                 parsedParameters,
                             )