[FEAT] Sending through the id and room in JSON format, Changing IPs

Author: JanF01

app/src/main/java/com/example/blockchainaccess/MyHostApduService.kt

@@ -6,11 +6,13 @@ import android.content.Intent
 import android.content.Context
 import android.app.Service
 import android.util.Log
+import org.json.JSONObject
 
 class MyHostApduService : HostApduService() {
 
 
     private var currentUserId: String = "unknown-user"
+    private val roomName: String = "roomA"
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         intent?.getStringExtra("NFC_USER_ID")?.let {
@@ -24,8 +26,22 @@ class MyHostApduService : HostApduService() {
         Log.d("HCE", "APDU Received: ${commandApdu.joinToString(" ") { "%02X".format(it) }}")
 
         if (commandApdu.size >= 4 && commandApdu[1] == 0xA4.toByte()) {
-            val responseData = currentUserId.toByteArray(Charsets.UTF_8)
-            return responseData + byteArrayOf(0x90.toByte(), 0x00.toByte())
+            try {
+                // 3. Create a JSON object and add the key-value pai
+                val jsonData = JSONObject()
+                jsonData.put("id", currentUserId)
+                jsonData.put("room", roomName)
+
+                // 4. Convert the JSON object to a UTF-8 byte array
+                val responseData = jsonData.toString().toByteArray(Charsets.UTF_8)
+
+                // 5. Return the JSON data followed by the success status word (90 00)
+                return responseData + byteArrayOf(0x90.toByte(), 0x00.toByte())
+
+            } catch (e: Exception) {
+                Log.e("HCE", "Error creating JSON data", e)
+                return byteArrayOf(0x6F.toByte(), 0x00.toByte()) // General error
+            }
         }
         return byteArrayOf(0x6A.toByte(), 0x82.toByte()) // File not found
     }

app/src/main/java/com/example/blockchainaccess/NetworkClient.kt

@@ -46,7 +46,7 @@ object NetworkClient {
 
     suspend fun addWhitelistEntry(userId: String): Result<Unit> {
         return try {
-            val url = "http://10.0.2.2:8081/new_whitelist_entry"
+            val url = "http://192.168.0.198:8081/new_whitelist_entry"
             val response = client.post(url) {
                 contentType(ContentType.Application.Json)
                 setBody(WhitelistEntryRequest(userId))
@@ -64,7 +64,7 @@ object NetworkClient {
 
     suspend fun removeWhitelistEntry(userId: String): Result<Unit> {
         return try {
-            val url = "http://10.0.2.2:8081/remove_whitelist_entry"
+            val url = "http://192.168.0.198:8081/remove_whitelist_entry"
             val response = client.post(url) {
                 contentType(ContentType.Application.Json)
                 setBody(WhitelistEntryRequest(userId))
@@ -82,7 +82,7 @@ object NetworkClient {
 
     suspend fun createAndRegisterProfile(username: String, password: String): Result<Pair<String, Set<String>>> {
         try {
-            val createProfileUrl = "http://10.0.2.2:8081/login"
+            val createProfileUrl = "http://192.168.0.198:8081/login"
             val response: HttpResponse = client.post(createProfileUrl) {
                 contentType(ContentType.Application.Json)
                 setBody(CreateProfileRequest(username, password))
@@ -103,7 +103,7 @@ object NetworkClient {
 
             println("Profile created. ID: $generatedId")
             // --- Step 2: Register user ID with 127.0.0.1:8081 ---
-            val registerUrl = "http://10.0.2.2:8081/app_save_id"
+            val registerUrl = "http://192.168.0.198:8081/app_save_id"
             val registerResponse: HttpResponse = client.post(registerUrl) {
                 contentType(ContentType.Application.Json)
                 setBody(UpdateUserRequest(generatedId))